REVIEWED: Advance template

8 files changed, 65 insertions, 75 deletions

diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile
index 8e3eb3fb..480405f8 100644
--- a/templates/advance_game/Makefile
+++ b/templates/advance_game/Makefile
@@ -371,11 +371,11 @@ endif
 # Define all source files required
 PROJECT_SOURCE_FILES ?= \
     advance_game.c \
-    screens/screen_logo.c \
-    screens/screen_title.c \
-    screens/screen_options.c \
-    screens/screen_gameplay.c \
-    screens/screen_ending.c
+    screen_logo.c \
+    screen_title.c \
+    screen_options.c \
+    screen_gameplay.c \
+    screen_ending.c
 
 # Define all object files from source files
 OBJS = $(patsubst %.c, %.o, $(PROJECT_SOURCE_FILES))
diff --git a/templates/advance_game/advance_game.c b/templates/advance_game/advance_game.c
index 68d31b6a..edfd7cf4 100644
--- a/templates/advance_game/advance_game.c
+++ b/templates/advance_game/advance_game.c
@@ -13,12 +13,15 @@
 ********************************************************************************************/
 
 #include "raylib.h"
-#include "screens/screens.h"    // NOTE: Defines global variable: currentScreen
+#include "screens.h"    // NOTE: Declares global (extern) variables and screens functions
 
 #if defined(PLATFORM_WEB)
     #include <emscripten/emscripten.h>
 #endif
 
+//----------------------------------------------------------------------------------
+// Shared Variables Definition (global)
+//----------------------------------------------------------------------------------
 GameScreen currentScreen = 0;
 Font font = { 0 };
 Music music = { 0 };
@@ -27,8 +30,8 @@ Sound fxCoin = { 0 };
 //----------------------------------------------------------------------------------
 // Global Variables Definition (local to this module)
 //----------------------------------------------------------------------------------
-const int screenWidth = 800;
-const int screenHeight = 450;
+static const int screenWidth = 800;
+static const int screenHeight = 450;
 
 // Required variables to manage screen transitions (fade-in, fade-out)
 static float transAlpha = 0.0f;
@@ -37,19 +40,16 @@ static bool transFadeOut = false;
 static int transFromScreen = -1;
 static int transToScreen = -1;
 
-// NOTE: Some global variables that require to be visible for all screens,
-// are defined in screens.h (i.e. currentScreen)
-    
 //----------------------------------------------------------------------------------
 // Local Functions Declaration
 //----------------------------------------------------------------------------------
-static void ChangeToScreen(int screen);     // No transition effect
+static void ChangeToScreen(int screen);     // Change to screen, no transition effect
 
-static void TransitionToScreen(int screen);
-static void UpdateTransition(void);
-static void DrawTransition(void);
+static void TransitionToScreen(int screen); // Request transition to next screen
+static void UpdateTransition(void);         // Update transition effect
+static void DrawTransition(void);           // Draw transition effect (full-screen rectangle)
 
-static void UpdateDrawFrame(void);          // Update and Draw one frame
+static void UpdateDrawFrame(void);          // Update and draw one frame
 
 //----------------------------------------------------------------------------------
 // Main entry point
@@ -66,7 +66,7 @@ int main(void)
     font = LoadFont("resources/mecha.png");
     music = LoadMusicStream("resources/ambient.ogg");
     fxCoin = LoadSound("resources/coin.wav");
-    
+
     SetMusicVolume(music, 1.0f);
     PlayMusicStream(music);
 
@@ -89,7 +89,7 @@ int main(void)
 
     // De-Initialization
     //--------------------------------------------------------------------------------------
-    
+
     // Unload current screen data before closing
     switch (currentScreen)
     {
@@ -99,14 +99,14 @@ int main(void)
         case ENDING: UnloadEndingScreen(); break;
         default: break;
     }
-    
+
     // Unload all global loaded data (i.e. fonts) here!
     UnloadFont(font);
     UnloadMusicStream(music);
     UnloadSound(fxCoin);
 
     CloseAudioDevice();     // Close audio context
-    
+
     CloseWindow();          // Close window and OpenGL context
     //--------------------------------------------------------------------------------------
 
@@ -129,7 +129,7 @@ static void ChangeToScreen(int screen)
         case ENDING: UnloadEndingScreen(); break;
         default: break;
     }
-    
+
     // Init next screen
     switch (screen)
     {
@@ -139,11 +139,11 @@ static void ChangeToScreen(int screen)
         case ENDING: InitEndingScreen(); break;
         default: break;
     }
-    
+
     currentScreen = screen;
 }
 
-// Define transition to next screen
+// Request transition to next screen
 static void TransitionToScreen(int screen)
 {
     onTransition = true;
@@ -159,13 +159,13 @@ static void UpdateTransition(void)
     if (!transFadeOut)
     {
         transAlpha += 0.05f;
-        
+
         // NOTE: Due to float internal representation, condition jumps on 1.0f instead of 1.05f
         // For that reason we compare against 1.01f, to avoid last frame loading stop
         if (transAlpha > 1.01f)
         {
             transAlpha = 1.0f;
-        
+
             // Unload current screen
             switch (transFromScreen)
             {
@@ -176,7 +176,7 @@ static void UpdateTransition(void)
                 case ENDING: UnloadEndingScreen(); break;
                 default: break;
             }
-            
+
             // Load next screen
             switch (transToScreen)
             {
@@ -186,9 +186,9 @@ static void UpdateTransition(void)
                 case ENDING: InitEndingScreen(); break;
                 default: break;
             }
-            
+
             currentScreen = transToScreen;
-            
+
             // Activate fade out effect to next loaded screen
             transFadeOut = true;
         }
@@ -196,7 +196,7 @@ static void UpdateTransition(void)
     else  // Transition fade out logic
     {
         transAlpha -= 0.02f;
-        
+
         if (transAlpha < -0.01f)
         {
             transAlpha = 0.0f;
@@ -220,22 +220,22 @@ static void UpdateDrawFrame(void)
     // Update
     //----------------------------------------------------------------------------------
     UpdateMusicStream(music);       // NOTE: Music keeps playing between screens
-    
+
     if (!onTransition)
     {
-        switch(currentScreen) 
+        switch(currentScreen)
         {
-            case LOGO: 
+            case LOGO:
             {
                 UpdateLogoScreen();
-                
+
                 if (FinishLogoScreen()) TransitionToScreen(TITLE);
 
             } break;
-            case TITLE: 
+            case TITLE:
             {
                 UpdateTitleScreen();
-                    
+
                 if (FinishTitleScreen() == 1) TransitionToScreen(OPTIONS);
                 else if (FinishTitleScreen() == 2) TransitionToScreen(GAMEPLAY);
 
@@ -243,22 +243,22 @@ static void UpdateDrawFrame(void)
             case OPTIONS:
             {
                 UpdateOptionsScreen();
-                    
+
                 if (FinishOptionsScreen()) TransitionToScreen(TITLE);
 
             } break;
             case GAMEPLAY:
             {
                 UpdateGameplayScreen();
-                
+
                 if (FinishGameplayScreen() == 1) TransitionToScreen(ENDING);
                 //else if (FinishGameplayScreen() == 2) TransitionToScreen(TITLE);
 
             } break;
             case ENDING:
-            { 
+            {
                 UpdateEndingScreen();
-                
+
                 if (FinishEndingScreen() == 1) TransitionToScreen(TITLE);
 
             } break;
@@ -267,14 +267,14 @@ static void UpdateDrawFrame(void)
     }
     else UpdateTransition();    // Update transition (fade-in, fade-out)
     //----------------------------------------------------------------------------------
-    
+
     // Draw
     //----------------------------------------------------------------------------------
     BeginDrawing();
-        
+
         ClearBackground(RAYWHITE);
-            
-        switch(currentScreen) 
+
+        switch(currentScreen)
         {
             case LOGO: DrawLogoScreen(); break;
             case TITLE: DrawTitleScreen(); break;
@@ -283,12 +283,12 @@ static void UpdateDrawFrame(void)
             case ENDING: DrawEndingScreen(); break;
             default: break;
         }
-         
+
         // Draw full screen rectangle in front of everything
         if (onTransition) DrawTransition();
-        
+
         //DrawFPS(10, 10);
-        
+
     EndDrawing();
     //----------------------------------------------------------------------------------
 }
diff --git a/templates/advance_game/screens/screen_ending.c b/templates/advance_game/screen_ending.c
index d487f34b..725ce2bb 100644
--- a/templates/advance_game/screens/screen_ending.c
+++ b/templates/advance_game/screen_ending.c
@@ -27,12 +27,10 @@
 #include "screens.h"
 
 //----------------------------------------------------------------------------------
-// Global Variables Definition (local to this module)
+// Module Variables Definition (local)
 //----------------------------------------------------------------------------------
-
-// Ending screen global variables
-static int framesCounter;
-static int finishScreen;
+static int framesCounter = 0;
+static int finishScreen = 0;
 
 //----------------------------------------------------------------------------------
 // Ending Screen Functions Definition
diff --git a/templates/advance_game/screens/screen_gameplay.c b/templates/advance_game/screen_gameplay.c
index ff072355..a82629cc 100644
--- a/templates/advance_game/screens/screen_gameplay.c
+++ b/templates/advance_game/screen_gameplay.c
@@ -27,12 +27,10 @@
 #include "screens.h"
 
 //----------------------------------------------------------------------------------
-// Global Variables Definition (local to this module)
+// Module Variables Definition (local)
 //----------------------------------------------------------------------------------
-
-// Gameplay screen global variables
-static int framesCounter;
-static int finishScreen;
+static int framesCounter = 0;
+static int finishScreen = 0;
 
 //----------------------------------------------------------------------------------
 // Gameplay Screen Functions Definition
diff --git a/templates/advance_game/screens/screen_logo.c b/templates/advance_game/screen_logo.c
index 708a9378..16d4e155 100644
--- a/templates/advance_game/screens/screen_logo.c
+++ b/templates/advance_game/screen_logo.c
@@ -27,10 +27,8 @@
 #include "screens.h"
 
 //----------------------------------------------------------------------------------
-// Global Variables Definition (local to this module)
+// Module Variables Definition (local)
 //----------------------------------------------------------------------------------
-
-// Logo screen global variables
 static int framesCounter = 0;
 static int finishScreen = 0;
 
@@ -60,12 +58,12 @@ void InitLogoScreen(void)
     finishScreen = 0;
     framesCounter = 0;
     lettersCount = 0;
-    
+
     logoPositionX = GetScreenWidth()/2 - 128;
     logoPositionY = GetScreenHeight()/2 - 128;
-    
+
     for (int i = 0; i < 8; i++) raylib[i] = '\0';
-    
+
     state = 0;
     alpha = 1.0f;
 }
@@ -129,7 +127,7 @@ void UpdateLogoScreen(void)
     else if (state == 4)
     {
         framesCounter++;
-        
+
         if (framesCounter > 100)
         {
             alpha -= 0.02f;
@@ -186,7 +184,7 @@ void DrawLogoScreen(void)
         DrawRectangle(GetScreenWidth()/2 - 112, GetScreenHeight()/2 - 112, 224, 224, Fade(RAYWHITE, alpha));
 
         DrawText(raylib, GetScreenWidth()/2 - 44, GetScreenHeight()/2 + 48, 50, Fade(BLACK, alpha));
-        
+
         if (framesCounter > 20) DrawText("powered by", logoPositionX, logoPositionY - 27, 20, Fade(DARKGRAY, alpha));
     }
 }
diff --git a/templates/advance_game/screens/screen_options.c b/templates/advance_game/screen_options.c
index 6b512f60..791ed970 100644
--- a/templates/advance_game/screens/screen_options.c
+++ b/templates/advance_game/screen_options.c
@@ -27,12 +27,10 @@
 #include "screens.h"
 
 //----------------------------------------------------------------------------------
-// Global Variables Definition (local to this module)
+// Module Variables Definition (local)
 //----------------------------------------------------------------------------------
-
-// Options screen global variables
-static int framesCounter;
-static int finishScreen;
+static int framesCounter = 0;
+static int finishScreen = 0;
 
 //----------------------------------------------------------------------------------
 // Options Screen Functions Definition
diff --git a/templates/advance_game/screens/screen_title.c b/templates/advance_game/screen_title.c
index 27d6053a..1b2ec3ea 100644
--- a/templates/advance_game/screens/screen_title.c
+++ b/templates/advance_game/screen_title.c
@@ -27,12 +27,10 @@
 #include "screens.h"
 
 //----------------------------------------------------------------------------------
-// Global Variables Definition (local to this module)
+// Module Variables Definition (local)
 //----------------------------------------------------------------------------------
-
-// Title screen global variables
-static int framesCounter;
-static int finishScreen;
+static int framesCounter = 0;
+static int finishScreen = 0;
 
 //----------------------------------------------------------------------------------
 // Title Screen Functions Definition
diff --git a/templates/advance_game/screens/screens.h b/templates/advance_game/screens.h
index af5ac885..01d38a00 100644
--- a/templates/advance_game/screens/screens.h
+++ b/templates/advance_game/screens.h
@@ -32,7 +32,7 @@
 typedef enum GameScreen { LOGO = 0, TITLE, OPTIONS, GAMEPLAY, ENDING } GameScreen;
 
 //----------------------------------------------------------------------------------
-// Global Variables Definition
+// Global Variables Declaration (shared by several modules)
 //----------------------------------------------------------------------------------
 extern GameScreen currentScreen;
 extern Font font;