From c0ef8ae976b0adb16ff5bfe10110e802095b3612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= <contact@matteodelabre.me>
Date: Tue, 8 Mar 2016 18:07:34 +0100
Subject: [PATCH] =?UTF-8?q?H=C3=A9ritage=20de=20Block=20depuis=20Objet=20e?=
 =?UTF-8?q?t=20pr=C3=A9paration=20des=20fonctions=20=C3=A0=20coder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 block.cpp |  8 +++++++-
 block.hpp | 19 +++++--------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/block.cpp b/block.cpp
index f159ff3..58b4516 100644
--- a/block.cpp
+++ b/block.cpp
@@ -1,3 +1,9 @@
 #include "block.cpp"
 
-// TODO: implémenter les fonctions de Block
+Block::Block() {
+    // TODO: implémenter cette fonction
+}
+
+void Block::draw(sf::RenderWindow& window) {
+    // TODO: implémenter cette fonction
+}
diff --git a/block.hpp b/block.hpp
index 24ba61c..ef55546 100644
--- a/block.hpp
+++ b/block.hpp
@@ -1,27 +1,18 @@
 #ifndef PTF_BLOCK_HPP
 #define PTF_BLOCK_HPP
 
+#include "object.hpp"
 #include <SFML/Graphics.hpp>
 #include <iostream>
 
-class Block {
-protected:
-    sf::Vector2i position;
-    int charge;
-
+class Block : public Object {
 public:
     Block();
 
+    /**
+     * Dessin du bloc dans la fenêtre donnée
+     */
     void draw(sf::RenderWindow& window);
-
-    // getters et setters
-    sf::Vector2i getPosition() {
-        return position;
-    }
-
-    int getCharge() {
-        return charge;
-    }
 };
 
 #endif