Merge branch 'develop' of https://github.com/raysan5/raylib into develop

This commit is contained in:
raysan5 2017-03-05 19:17:05 +01:00
commit aaf9c648d3
2 changed files with 9 additions and 9 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

View file

@ -8,7 +8,7 @@
* This game has been created using raylib v1.2 (www.raylib.com) * This game has been created using raylib v1.2 (www.raylib.com)
* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
* *
* Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) * Copyright (c) 2014 Ramon Santamaria (@raysan5)
* *
********************************************************************************************/ ********************************************************************************************/
@ -28,17 +28,17 @@ int main()
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
const int screenWidth = 800; const int screenWidth = 800;
const int screenHeight = 450; const int screenHeight = 450;
const char windowTitle[30] = "<game name goes here>"; const char windowTitle[30] = "<game name goes here>";
GameScreen currentScreen = LOGO;
InitWindow(screenWidth, screenHeight, windowTitle); InitWindow(screenWidth, screenHeight, windowTitle);
GameScreen currentScreen = LOGO;
// TODO: Initialize all required variables and load all required data here! // TODO: Initialize all required variables and load all required data here!
int framesCounter = 0; // Used to count frames int framesCounter = 0; // Useful to count frames
SetTargetFPS(60); SetTargetFPS(60); // Set desired framerate (frames-per-second)
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
// Main game loop // Main game loop
@ -149,4 +149,4 @@ int main()
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
return 0; return 0;
} }