aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2015-09-09 12:31:29 -0400
committerClyne Sullivan <tullivan99@gmail.com>2015-09-09 12:31:29 -0400
commitaf49aebdb758f5359bf5ebbc7a1b8ae94cdb9014 (patch)
treeafd97968f702c5468583930396e26956f1e1e42e /include
parent1f588ad63cfc0ddc87d58bee8234fe2f69628862 (diff)
mhm
Diffstat (limited to 'include')
-rw-r--r--include/common.h6
-rw-r--r--include/windowClass.h13
2 files changed, 3 insertions, 16 deletions
diff --git a/include/common.h b/include/common.h
index 56bbe3f..816de5a 100644
--- a/include/common.h
+++ b/include/common.h
@@ -9,10 +9,10 @@
#include <SDL2/SDL_image.h>
#include <SDL2/SDL_opengl.h>
#include <UIClass.h>
-#include <windowClass.h>
+#include <World.h>
-#define SCREEN_WIDTH 1280
-#define SCREEN_HEIGHT 720
+#define SCREEN_WIDTH 640
+#define SCREEN_HEIGHT 480
//#define FULLSCREEN
//SDL VARIABLES
diff --git a/include/windowClass.h b/include/windowClass.h
deleted file mode 100644
index 1aaae98..0000000
--- a/include/windowClass.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef WINDOWCLASS_H
-#define WINDOWCLASS_H
-
-#include <common.h>
-
-class Window{
-public:
- void setupRender();
- void render();
-
-};
-
-#endif //WINDOWCLASS_H \ No newline at end of file