1 files changed, 65 insertions, 31 deletions
diff --git a/include/common.h b/include/common.h
index 782ebd6..48a068d 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,31 +1,65 @@
-#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
-
-
-
-//SDL VARIABLES
-extern SDL_Window    *window;
-extern SDL_Surface   *renderSurface;
-extern SDL_GLContext  mainGLContext;
-
-//WINODWS VARIABLES
-extern bool gameRunning;
-
-#endif // COMMON_H
+<<<<<<< HEAD
+#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
+=======
+#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
+
+
+
+//SDL VARIABLES
+extern SDL_Window    *window;
+extern SDL_Surface   *renderSurface;
+extern SDL_GLContext  mainGLContext;
+
+//WINODWS VARIABLES
+extern bool gameRunning;
+
+#endif // COMMON_H
+>>>>>>> origin/master