diff options
author | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-26 07:33:28 -0500 |
---|---|---|
committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-26 07:33:28 -0500 |
commit | 368b446c29d2001246cab2d40e406708f7c6bf7d (patch) | |
tree | ef90399051e79660c9b9eb8322c0e74348951b74 /main.cpp | |
parent | cc28c882ce57c23bf79a2afec24b72f9942d6077 (diff) |
merge
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -252,16 +252,15 @@ int main(/*int argc, char *argv[]*/){ * */ + uint32_t SDL_CreateWindowFlags = SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL | (FULLSCREEN ? SDL_WINDOW_FULLSCREEN : 0); + window = SDL_CreateWindow(GAME_NAME, SDL_WINDOWPOS_UNDEFINED, // Spawn the window at random (undefined) x and y coordinates SDL_WINDOWPOS_UNDEFINED, // SCREEN_WIDTH, SCREEN_HEIGHT, - SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL -#ifdef FULLSCREEN - | SDL_WINDOW_FULLSCREEN -#endif // FULLSCREEN - ); + SDL_CreateWindowFlags + ); /* * Exit if the window cannot be created @@ -439,7 +438,6 @@ int main(/*int argc, char *argv[]*/){ * fps contains the game's current FPS, debugY contains the player's * y coordinates, updated at a certain interval. These are used in * the debug menu (see below). - * */ static unsigned int fps=0; |