From c3b46574b39a562614d1c6aa4a07bb6bb55fe157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= <contact@matteodelabre.me>
Date: Wed, 20 Apr 2016 17:48:55 +0200
Subject: [PATCH] =?UTF-8?q?Impl=C3=A9mentation=20du=20bloc=20tueur=20comme?=
 =?UTF-8?q?=20une=20ic=C3=B4ne=20sur=20le=20bloc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/kill_block.hpp              |  22 ++++++++++++----------
 res/textures/objects/kill_block.tga | Bin 3535 -> 2274 bytes
 src/kill_block.cpp                  |  19 +++++++++++++++----
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/include/kill_block.hpp b/include/kill_block.hpp
index 1ca3177..7119d25 100644
--- a/include/kill_block.hpp
+++ b/include/kill_block.hpp
@@ -15,14 +15,6 @@ class KillBlock : public Block {
 public:
     typedef std::shared_ptr<KillBlock> Ptr;
 
-protected:
-    /**
-     * Initialisation des propriétés du bloc tueur donné
-     * depuis le fichier donné
-     */
-    static void init(std::ifstream& file, Object::Ptr object);
-
-public:
     /**
      * Identifiant unique du type "bloc tueur"
      */
@@ -37,9 +29,9 @@ public:
     virtual Object::Ptr clone() const;
 
     /**
-     * Prépare les textures avant le dessin du bloc
+     * Dessine le bloc
      */
-    virtual void prepareDraw();
+    virtual void draw(Level& level);
 
     /**
      * Appelé lorsque le bloc tueur est activé par un objet
@@ -60,6 +52,16 @@ public:
      * Sauvegarde le bloc tueur dans le fichier donné
      */
     virtual void save(std::ofstream& file) const;
+
+private:
+    sf::Sprite icon_sprite;
+
+protected:
+    /**
+     * Initialisation des propriétés du bloc tueur donné
+     * depuis le fichier donné
+     */
+    static void init(std::ifstream& file, Object::Ptr object);
 };
 
 #endif
diff --git a/res/textures/objects/kill_block.tga b/res/textures/objects/kill_block.tga
index 010385da05a96104bf7f18285ff6d9d1322c2890..59050cd23e8808e285542a1304111baae0cded36 100644
GIT binary patch
literal 2274
zcmb`JS!k745P*NZv56t3#;sZxt_!XhwRU-^sS%sTt8uBuC8!t|q)2Op+G<-Bt>WHQ
zqhj0@6vVpQ7Au1K;IoR)QVM;Lf`TulVETP?H}c+r?`;2^IWu$S+$2fLle|<X)k(VS
zg41ZWIqC?VU=0lYfhJZ4(64m-qbs49VlXQ=`JKM&cQlEs{oq$P0Phwzlra4YCb$eI
zpmZxu;+Gy!3k~odbSZr4%<L?Tg$%3;lkvGXQ_Wq1Qc&i@ZI}lg;B`0;=U^Qy1>Lv;
zhoJ%tx*6Q314<?Q2IC?Lah#r<fj8kDs0PLL^>7_b#fV6dtF>S%G`t#K0c9kNfk|+%
zc!2R3rm6e}jMVMZLDBF0xDVqQ(3I=D(<>jt3NZF*U<{tH6Lvv5j@!W~>6&8`y~pUg
z>G&E{XoNcW2)4i{Pz9P)*L_v{X~J*>_ZkyTErBn=ubNxu{%=z>`ln$HR9Yf&RPrhV
zT{a{?-GK$L2sVJ*R)I#p0QLO-5WLEo7Mf(cjg>GNG-DXLd=V_*Rwy^Mp=AP&K{H%}
zUf>P`Y}iK=VMjsxZ1lmaT?;qC`1M;^4AzEaX3k1rAsBKqD04tZF2jeQ^oG4~13m>K
zXo3#bK=JtHOw8kWm<;)2YZ&Y8W4I4_vldtzSTX-XB`7n&lsy1lc>|R0Fa^dzE7TW{
zFJtPpn$EtUXx{DCl2O-3N{v|!58MXNAmzo!3-NZBfqQ&-W~x6Zqu>`Pk7L7F6;mVq
z94f%$2Y_b0aK-Ti=;H+OXUv167U<LP))tzmO`oSS989;nt<NFf)5Lp=U!k5%jO_^2
zgJNX<h$tF2wSRyPSv1~w7ch>e;P=g-Tnq<Nj6Q=k;Nc~4=vGGI$6We}5qC#M_aF`b
zxK&#@BYG@%V_nVX&<$?662D`9_o2==&)K)7;tF^KO&-#wH!s0^R3_?3n|en41ZvGp
z_C0Ce^7mbPX(s4r_zQIIZ!igpxqSf|{}axDC4K^KLZ^K+S+n|J*vsH7ltu`;Z?*N%
z&j{98&-msJojD4tVQSHst{;ScaLxA=xwuL{4EDBH^meVhmV)9bW){)u_KHS15Pm8s
zdh}p8-d^!IOQz-Rf?|y`*ick7v_@DSMeb||j4vt}gnu<mROhgyl73x_+fY5?nnHgJ
zQoHjj-p^GS6^c9a%S{X}!^pzQXl7nyZ3|8Ice{eY5I70fVLfDE1Psdc_4FITt*wwg
zK$GmTDFeNJAG{Uo?hqKI)ovzAUC92Iap8X%X+&w9J-2RNW=>}2jL{1|$TZYdC;tKG
Cz2L(D

literal 3535
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
KAxR0HJ^usb3xN*+

diff --git a/src/kill_block.cpp b/src/kill_block.cpp
index 33945ea..711a87a 100644
--- a/src/kill_block.cpp
+++ b/src/kill_block.cpp
@@ -1,3 +1,4 @@
+#include "manager.hpp"
 #include "resource_manager.hpp"
 #include "kill_block.hpp"
 #include "game.hpp"
@@ -5,16 +6,26 @@
 
 const unsigned int KillBlock::TYPE_ID = 5;
 
-KillBlock::KillBlock() : Block() {}
+KillBlock::KillBlock() : Block() {
+    icon_sprite.setOrigin(sf::Vector2f(23, 23));
+    icon_sprite.setTexture(*ResourceManager::get().getTexture(
+        "objects/kill_block.tga"
+    ));
+}
+
 KillBlock::~KillBlock() {}
 
 Object::Ptr KillBlock::clone() const {
     return Object::Ptr(new KillBlock(*this));
 }
 
-void KillBlock::prepareDraw() {
-    Block::prepareDraw();
-    sprite.setTexture(*ResourceManager::get().getTexture("objects/kill_block.tga"));
+void KillBlock::draw(Level& level) {
+    // on dessine le bloc normal
+    Block::draw(level);
+
+    // on dessine l'icône
+    icon_sprite.setPosition(getPosition());
+    level.getManager().getWindow().draw(icon_sprite);
 }
 
 void KillBlock::activate(Game& game, Object::Ptr object) {