fixed

1 files changed, 56 insertions, 25 deletions

diff --git a/include/entities.h b/include/entities.h
index 3ecf014..89d9ec3 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -1,26 +1,57 @@
-#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();

-};

-

+<<<<<<< HEAD
+#ifndef ENTITIES_H
+#define ENTITIES_H
+
+#include <common.h>
+
+
+class Entities{
+public:
+	float width;
+	float height;
+	float speed;
+	int type;
+	vec2 loc;
+	vec2 loci;
+	vec2 vel;
+	vec2 velg;
+
+	void spawn(float, float);
+
+
+};
+
+class Player : public Entities{
+public:
+	Player();
+	~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