From 9e81d6b967d87a163ecb6123eb34b9817fa13454 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Fri, 11 Sep 2015 17:40:56 -0400 Subject: good merge --- include/common.h | 6 ++++-- include/entities.h | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/common.h b/include/common.h index df5b6ac..2a6d66b 100644 --- a/include/common.h +++ b/include/common.h @@ -15,8 +15,8 @@ typedef struct{float x; float y;}vec2; #include #define SCREEN_WIDTH 1280 -#define SCREEN_HEIGHT 720 -//#define FULLSCREEN +#define SCREEN_HEIGHT 800 +#define FULLSCREEN #define HLINE (2.0f / (SCREEN_WIDTH / 4)) @@ -28,4 +28,6 @@ extern SDL_GLContext mainGLContext; //WINDOW VARIABLES extern bool gameRunning; +extern int grand(void); + #endif // COMMON_H diff --git a/include/entities.h b/include/entities.h index 5f0c9ee..5deaa00 100644 --- a/include/entities.h +++ b/include/entities.h @@ -13,10 +13,7 @@ public: vec2 loci; vec2 vel; vec2 velg; - void spawn(float, float); - - }; class Player : public Entities{ -- cgit v1.2.3