From b3f2204f9d3de917493488f04e2c25b180e7cfe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <drummyfish@disroot.org>
Date: Sun, 20 Sep 2020 10:04:19 +0200
Subject: [PATCH] Implement exit

---
 game.h     | 17 +++++++++++++----
 main_sdl.c |  5 +++--
 texts.h    |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/game.h b/game.h
index a8d6d29..92ec72d 100755
--- a/game.h
+++ b/game.h
@@ -147,8 +147,9 @@ uint8_t SFG_load(uint8_t data[SFG_SAVE_SIZE]);
 
 /**
   Game main loop body, call this inside the platform's specific main loop.
+  Returns 1 if the game continues, 0 if the game was exited.
 */
-void SFG_mainLoopBody();
+uint8_t SFG_mainLoopBody();
 
 /**
   Initializes the whole program, call this in the platform initialization.
@@ -361,6 +362,7 @@ struct
                            8b   plasma ammo at saved position
                            32b  little endian total play time, in 10ths of sec
                            16b  little endian total enemies killed from start */
+  uint8_t continues;  ///< Whether the game continues or was exited.
 } SFG_game;
 
 /**
@@ -1563,6 +1565,7 @@ void SFG_init()
 
   SFG_game.frame = 0;
   SFG_game.currentRandom = 0;
+  SFG_game.continues = 1;
 
   RCL_initRayConstraints(&SFG_game.rayConstraints);
   SFG_game.rayConstraints.maxHits = SFG_RAYCASTING_MAX_HITS;
@@ -3616,6 +3619,10 @@ void SFG_gameStepMenu()
         break;
       }
 
+      case SFG_MENU_ITEM_EXIT:
+        SFG_game.continues = 0;
+        break;
+
       default:
         break;
     }
@@ -4099,7 +4106,7 @@ void SFG_drawMenu()
 
   uint8_t i = 0;
 
-  while (1)
+  while (1) // draw menu items
   {
     uint8_t item = SFG_getMenuItem(i);
 
@@ -4118,7 +4125,7 @@ void SFG_drawMenu()
     if (i != SFG_game.selectedMenuItem)
       textColor = 23;
     else
-      SFG_fillRectangle(  
+      SFG_fillRectangle( // menu item highlight
         SELECTION_START_X,
         y - SFG_FONT_SIZE_MEDIUM,
         SFG_GAME_RESOLUTION_X - SELECTION_START_X * 2,
@@ -4529,7 +4536,7 @@ void SFG_draw()
   }
 }
 
-void SFG_mainLoopBody()
+uint8_t SFG_mainLoopBody()
 {
   /* Standard deterministic game loop, independed of actual achieved FPS.
      Each game logic (physics) frame is performed with the SFG_MS_PER_FRAME
@@ -4574,6 +4581,8 @@ void SFG_mainLoopBody()
   {
     SFG_sleepMs((timeNextFrame - timeNow) / 2); // wait, relieve CPU
   }
+
+  return SFG_game.continues;
 }
 
 #endif // guard
diff --git a/main_sdl.c b/main_sdl.c
index ddb08c2..aa9c137 100644
--- a/main_sdl.c
+++ b/main_sdl.c
@@ -231,14 +231,15 @@ void mainLoopIteration()
   if (sdlKeyboardState[SDL_SCANCODE_ESCAPE])
     running = 0;
 
-  SFG_mainLoopBody();
+  if (!SFG_mainLoopBody())
+    running = 0;
 
   SDL_UpdateTexture(texture,NULL,screen,SFG_SCREEN_RESOLUTION_X * sizeof(uint16_t));
 
   SDL_RenderClear(renderer);
   SDL_RenderCopy(renderer,texture,NULL,NULL);
   SDL_RenderPresent(renderer);
-}   
+}
 
 #ifdef __EMSCRIPTEN__
 typedef void (*em_callback_func)(void);
diff --git a/texts.h b/texts.h
index b9263eb..7e97493 100644
--- a/texts.h
+++ b/texts.h
@@ -18,7 +18,7 @@ SFG_PROGRAM_MEMORY char *SFG_menuItemTexts[] =
 {
   "continue",
   "map",
-  "play level",
+  "play",
   "load",
   "sound",
   "look",