more fixes :)

2 files changed, 2 insertions, 30 deletions

diff --git a/include/World.h b/include/World.h
index d8440a0..f6a08f9 100644
--- a/include/World.h
+++ b/include/World.h
@@ -19,6 +19,7 @@ public:
 	World(const float width,World *l,World *r);

 	void draw(void);

 	void detect(vec2 *v,const float width);

+	float getWidth(void);

 };

 

 #endif // WORLD_H
diff --git a/include/entities.h b/include/entities.h
index 89d9ec3..5f0c9ee 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -1,10 +1,8 @@
-<<<<<<< HEAD
 #ifndef ENTITIES_H
 #define ENTITIES_H
 
 #include <common.h>
 
-
 class Entities{
 public:
 	float width;
@@ -27,31 +25,4 @@ public:
 	~Player();
 };
 
-=======
-#ifndef ENTITIES_H
-#define ENTITIES_H
-
-#include <common.h>
-
-
-class Entities{
-public:
-	float width;
-	float height;
-	float speed;
-	int type;
-	vec2 loc;
-
-	void spawn(float, float);
-
-
-};
-
-class Player : public Entities{
-public:
-	Player();
-	~Player();
-};
-
->>>>>>> origin/master
-#endif //ENTITIES_H
\ No newline at end of file
+#endif // ENTITIES_H