fixed

3 files changed, 88 insertions, 57 deletions

diff --git a/include/World.h b/include/World.h
index 3b4b56d..d8440a0 100644
--- a/include/World.h
+++ b/include/World.h
@@ -21,4 +21,4 @@ public:
 	void detect(vec2 *v,const float width);

 };

 

-#endif // WORLD_H

+#endif // WORLD_H
diff --git a/include/common.h b/include/common.h
index 9ce1be0..df5b6ac 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,31 +1,31 @@
-#ifndef COMMON_H

-#define COMMON_H

-

-typedef struct{float x; float y;}vec2;

-

-///THIS FILE IS USED FOR VARIABLES THAT WILL BE ACCESED BY MULTIPLE CLASSES/FILES

-

-#include <iostream>

-#include <cstdlib>

-#include <SDL2/SDL.h>

-#include <SDL2/SDL_image.h>

-#include <SDL2/SDL_opengl.h>

-#include <UIClass.h>

-#include <entities.h>

-#include <World.h>

-

-#define SCREEN_WIDTH  1280

-#define SCREEN_HEIGHT 800

-#define FULLSCREEN

-

-#define HLINE (2.0f/(SCREEN_WIDTH/4))

-

-//SDL VARIABLES

-extern SDL_Window    *window;

-extern SDL_Surface   *renderSurface;

-extern SDL_GLContext  mainGLContext;

-

-//WINODWS VARIABLES

-extern bool gameRunning;

-

-#endif // COMMON_H

+#ifndef COMMON_H
+#define COMMON_H
+
+typedef struct{float x; float y;}vec2;
+
+///THIS FILE IS USED FOR VARIABLES THAT WILL BE ACCESED BY MULTIPLE CLASSES/FILES
+
+#include <iostream>
+#include <cstdlib>
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_image.h>
+#include <SDL2/SDL_opengl.h>
+#include <UIClass.h>
+#include <entities.h>
+#include <World.h>
+
+#define SCREEN_WIDTH  1280
+#define SCREEN_HEIGHT 720
+//#define FULLSCREEN
+
+#define HLINE (2.0f / (SCREEN_WIDTH / 4))
+
+//SDL VARIABLES
+extern SDL_Window    *window;
+extern SDL_Surface   *renderSurface;
+extern SDL_GLContext  mainGLContext;
+
+//WINDOW VARIABLES
+extern bool gameRunning;
+
+#endif // COMMON_H
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