Added player

diff --git a/src/Moving_object.h b/src/Moving_object.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..df01e7ffd4003440f9462de60144caf964264c4d 100644 (file)
--- a/src/Moving_object.h
+++ b/src/Moving_object.h
@@ -0,0 +1,12 @@
+#ifndef MOVING_OBJECTS_H
+#define MOVING_OBJECTS_H
+
+#include "Object.h"
+
+class Moving_object : Object
+{
+public:
+protected:
+private:
+};
+#endif
\ No newline at end of file

diff --git a/src/Object.h b/src/Object.h
index 5fb30210ee3c519880f6afef4b71188fd017479f..dd5ed78084f54a9ab2ca0e6f6b3b087124a994d5 100644 (file)
--- a/src/Object.h
+++ b/src/Object.h
@@ -1,3 +1,6 @@
+#ifndef OBJECT_H
+#define OBJECT_H
+
 #include <SFML/Graphics.hpp>
 #include <vector>
 
@@ -15,4 +18,6 @@ protected:
     double x_pos;
     double y_pos;
     sf::Sprite sprite;
-};
\ No newline at end of file
+};
+
+#endif
\ No newline at end of file

diff --git a/src/Player.h b/src/Player.h
index af6e1dc82ee7126c89c264c76762b8d39ecc6505..de9d49ba32018f5a4507915322485cde9e18db6e 100644 (file)
--- a/src/Player.h
+++ b/src/Player.h
@@ -1,11 +1,20 @@
 
+#include <SFML/Graphics.hpp>
+#include "Moving_object.h"
 #include "Object.h"
 
-class Player::Object
-{
-
-
-
 
+class Player : Moving_object
+{
+public:
+    Player();
+    ~Player();
+    bool collides(Object& other);
+    void collision(Object& other);
+    void update();
+    void render(sf::RenderWindow& window);
 
-}
\ No newline at end of file
+protected:
+private:
+    int collected;
+};
\ No newline at end of file