diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2015-10-29 08:13:09 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-10-29 08:13:09 -0400 |
| commit | 9542d9a8a022fe1d3390510e8a135a4917df7aa7 (patch) | |
| tree | 19386c919e375a8185939fcda73b841901d20602 /include | |
| parent | 2ae6503dd2aa1be80ed2b679cdcce1286fa85d60 (diff) | |
fixed world
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 7 | ||||
| -rw-r--r-- | include/world.h | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/common.h b/include/common.h index 6d11c57..3c83e66 100644 --- a/include/common.h +++ b/include/common.h @@ -49,9 +49,8 @@ typedef struct { #define GAME_NAME "Independent Study v.0.2 alpha" -#define SCREEN_WIDTH 1920 -#define SCREEN_HEIGHT 1080 -#define FULLSCREEN +#define SCREEN_WIDTH 1280 +#define SCREEN_HEIGHT 720 //#define FULLSCREEN @@ -66,7 +65,7 @@ typedef struct { * */ -#define HLINE 3 // 3 as in 3 pixels +#define HLINE 2 // 3 as in 3 pixels /* * Define 'our' random number generation library. Eventually these macros will be replaced diff --git a/include/world.h b/include/world.h index 03b0d96..ef9ef6e 100644 --- a/include/world.h +++ b/include/world.h @@ -36,7 +36,6 @@ protected: void singleDetect(Entity *e); // Handles an individual entity (gravity n' stuff) public: unsigned int lineCount; // Size of the array 'line' (aka the width of the world) - unsigned int worldWidth; World *toLeft,*toRight; // Pointers to areas to the left and right of this world. These are made public // so that they can easily be set without a function. World *infront; @@ -71,6 +70,8 @@ public: void addPlatform(float x,float y,float w,float h); // Dynamically adds a platform to the platform array. These will be automatically // drawn and handled by the world. void addHole(unsigned int start,unsigned int end); // Create a hole in the world + + int getWidth(void); }; float worldGetYBase(World *w); |