mirror/anarch
1
0
Fork 0
mirror of https://gitlab.com/drummyfish/anarch.git synced 2024-12-22 07:18:49 -05:00
Code Issues Projects Releases Wiki Activity

Implement exit

Browse Source
This commit is contained in:
Miloslav Číž 2020-09-20 10:04:19 +02:00
parent 02e94f6f67
commit b3f2204f9d
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
game.h
View File

@ -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. 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. Initializes the whole program, call this in the platform initialization.
@ -361,6 +362,7 @@ struct
8b plasma ammo at saved position 8b plasma ammo at saved position
32b little endian total play time, in 10ths of sec 32b little endian total play time, in 10ths of sec
16b little endian total enemies killed from start */ 16b little endian total enemies killed from start */
uint8_t continues; ///< Whether the game continues or was exited.
} SFG_game; } SFG_game;
/** /**
@ -1563,6 +1565,7 @@ void SFG_init()
SFG_game.frame = 0; SFG_game.frame = 0;
SFG_game.currentRandom = 0; SFG_game.currentRandom = 0;
SFG_game.continues = 1;
RCL_initRayConstraints(&SFG_game.rayConstraints); RCL_initRayConstraints(&SFG_game.rayConstraints);
SFG_game.rayConstraints.maxHits = SFG_RAYCASTING_MAX_HITS; SFG_game.rayConstraints.maxHits = SFG_RAYCASTING_MAX_HITS;
@ -3616,6 +3619,10 @@ void SFG_gameStepMenu()
break; break;
} }
case SFG_MENU_ITEM_EXIT:
SFG_game.continues = 0;
break;
default: default:
break; break;
} }
@ -4099,7 +4106,7 @@ void SFG_drawMenu()
uint8_t i = 0; uint8_t i = 0;
while (1) while (1) // draw menu items
{ {
uint8_t item = SFG_getMenuItem(i); uint8_t item = SFG_getMenuItem(i);
@ -4118,7 +4125,7 @@ void SFG_drawMenu()
if (i != SFG_game.selectedMenuItem) if (i != SFG_game.selectedMenuItem)
textColor = 23; textColor = 23;
else else
SFG_fillRectangle( SFG_fillRectangle( // menu item highlight
SELECTION_START_X, SELECTION_START_X,
y - SFG_FONT_SIZE_MEDIUM, y - SFG_FONT_SIZE_MEDIUM,
SFG_GAME_RESOLUTION_X - SELECTION_START_X * 2, 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. /* Standard deterministic game loop, independed of actual achieved FPS.
Each game logic (physics) frame is performed with the SFG_MS_PER_FRAME 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 SFG_sleepMs((timeNextFrame - timeNow) / 2); // wait, relieve CPU
} }
return SFG_game.continues;
} }
#endif // guard #endif // guard

3
main_sdl.c
View File

@ -231,7 +231,8 @@ void mainLoopIteration()
if (sdlKeyboardState[SDL_SCANCODE_ESCAPE]) if (sdlKeyboardState[SDL_SCANCODE_ESCAPE])
running = 0; running = 0;
SFG_mainLoopBody(); if (!SFG_mainLoopBody())
running = 0;
SDL_UpdateTexture(texture,NULL,screen,SFG_SCREEN_RESOLUTION_X * sizeof(uint16_t)); SDL_UpdateTexture(texture,NULL,screen,SFG_SCREEN_RESOLUTION_X * sizeof(uint16_t));

2
texts.h
View File

@ -18,7 +18,7 @@ SFG_PROGRAM_MEMORY char *SFG_menuItemTexts[] =
{ {
"continue", "continue",
"map", "map",
"play level", "play",
"load", "load",
"sound", "sound",
"look", "look",