Options in pause menu #284

cxong · Mar 14, 2024 · 8e21906 · 8e21906
1 parent 672777a
commit 8e21906
Show file tree

Hide file tree

Showing 7 changed files with 352 additions and 216 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -33,6 +33,7 @@ set(CDOGS_SDL_SOURCES
 	menu.c
 	menu_utils.c
 	namegen.c
+	options_menu.c
 	password.c
 	pause_menu.c
 	player_select_menus.c
@@ -57,6 +58,7 @@ set(CDOGS_SDL_HEADERS
 	menu.h
 	menu_utils.h
 	namegen.h
+	options_menu.h
 	password.h
 	pause_menu.h
 	player_select_menus.h

diff --git a/src/game.c b/src/game.c
@@ -134,6 +134,17 @@ static void RunGameReset(RunGameData *rData)
 	BlitUpdateFromBuf(&gGraphicsDevice, gGraphicsDevice.bkg);
 	CameraReset(&rData->Camera);
 }
+static void OnGfxChangeCallback(void *data, const bool resetBg)
+{
+	RunGameData *rData = data;
+	if (resetBg)
+	{
+		RunGameReset(rData);
+	}
+	rData->pm.ms.size = svec2i(
+		rData->pm.ms.graphics->cachedConfig.Res.x,
+		rData->pm.ms.graphics->cachedConfig.Res.y);
+}
 static void RunGameTerminate(GameLoopData *data)
 {
 	RunGameData *rData = data->Data;
@@ -216,7 +227,9 @@ static void RunGameOnEnter(GameLoopData *data)
 		}
 	}
 
-	PauseMenuInit(&rData->pm, &gEventHandlers, &gGraphicsDevice);
+	PauseMenuInit(
+		&rData->pm, &gEventHandlers, &gGraphicsDevice, OnGfxChangeCallback,
+		rData);
 
 	rData->m->state = MISSION_STATE_WAITING;
 	rData->m->isDone = false;
@@ -645,7 +658,9 @@ static void RunGameDraw(GameLoopData *data)
 	// Draw HUD layer
 	BlitClearBuf(&gGraphicsDevice);
 	CameraDrawMode(&rData->Camera);
-	HUDDraw(&rData->Camera.HUD, rData->Camera.NumViews, PauseMenuIsShown(&rData->pm));
+	HUDDraw(
+		&rData->Camera.HUD, rData->Camera.NumViews,
+		PauseMenuIsShown(&rData->pm));
 	PauseMenuDraw(&rData->pm);
 	// Draw automap if enabled
 	if (rData->isMap)