Add named constants for main menu choices

signus-game · Jan 30, 2022 · 29692e2 · 29692e2
1 parent 6f7ba54
commit 29692e2
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 49 deletions.
diff --git a/signus/src/mainmenu.cpp b/signus/src/mainmenu.cpp
@@ -118,8 +118,8 @@ static int ProcessMenu(const char *mask1, const char *mask2) {
 				sel = 0;
 			}
 
-			if (sel > 3) {
-				sel = 3;
+			if (sel > MAINMENU_MAX) {
+				sel = MAINMENU_MAX;
 			}
 
 			// Select
@@ -140,25 +140,25 @@ static int ProcessMenu(const char *mask1, const char *mask2) {
 				break;
 			// Exit
 			case kbEsc:
-				sel = 3;
+				sel = MAINMENU_EXIT;
 				run = FALSE;
 				break;
 			// Select up
 			case kbUp:
-				sel = sel > 0 ? sel - 1 : 3;
+				sel = sel > 0 ? sel - 1 : MAINMENU_MAX;
 				PlaySample(MenuSnd, 8, 32, 128);
 				DrawMN(pt1, pt2, bg, sel);
 				break;
 			// Select down
 			case kbDown:
-				sel = sel < 3 ? sel + 1 : 0;
+				sel = sel < MAINMENU_MAX ? sel + 1 : 0;
 				PlaySample(MenuSnd, 8, 32, 128);
 				DrawMN(pt1, pt2, bg, sel);
 				break;
 			}
 		} else if (e.What == evQuit) {
 			PutEvent(&e);
-			sel = 3;
+			sel = MAINMENU_EXIT;
 			run = FALSE;
 		}
 	}
@@ -174,42 +174,56 @@ static int ProcessMenu(const char *mask1, const char *mask2) {
 
 extern char ActualDifficulty;
 
-int DoMainMenu()
-{
-    int rtval = -1;
-    //char *pa = (char*) GraphicsDF->get("menupal");
-    uint8_t *pa = (uint8_t*) GraphicsDF->get("palette");
-
-    PlayMusic("solution.s3m");
-
-    DoneInteract();
-    ClearScr();
-    SetPalette(pa);
-    MenuSnd = LoadSample("menu", FALSE);
-    FlashSnd = LoadSample("flash", FALSE);
-
-    while (rtval == -1) {
-        rtval = ProcessMenu("mmnu0", "mmnu1");
-        if (rtval == 0) /*new game*/ {
-            rtval = ProcessMenu("mmnu2", "mmnu3"); // dificulty
-            if (rtval == 3) {rtval = -1; continue;}
-            switch (rtval) {
-                case 0 : ActualDifficulty = 'e'; break;
-                case 1 : ActualDifficulty = 'n'; break;
-                case 2 : ActualDifficulty = 'h'; break;                
-            }
-            rtval = 0;
-            break;
-        }
-    }
-
-    FreeSample(MenuSnd);
-    FreeSample(FlashSnd);
-    ClearScr();
-    SetPalette(Palette);
-    InitInteract();
-    memfree(pa);
-    return rtval;
+int DoMainMenu() {
+	int rtval = -1;
+	//char *pa = (char*) GraphicsDF->get("menupal");
+	uint8_t *pa = (uint8_t*) GraphicsDF->get("palette");
+
+	PlayMusic("solution.s3m");
+
+	DoneInteract();
+	ClearScr();
+	SetPalette(pa);
+	MenuSnd = LoadSample("menu", FALSE);
+	FlashSnd = LoadSample("flash", FALSE);
+
+	while (rtval == -1) {
+		rtval = ProcessMenu("mmnu0", "mmnu1");
+
+		if (rtval == MAINMENU_NEWGAME) {
+			rtval = ProcessMenu("mmnu2", "mmnu3"); // dificulty
+
+			if (rtval == MAINMENU_EXIT) {
+				rtval = -1;
+				continue;
+			}
+
+			switch (rtval) {
+			case 0:
+				ActualDifficulty = 'e';
+				break;
+
+			case 1:
+				ActualDifficulty = 'n';
+				break;
+
+			case 2:
+				ActualDifficulty = 'h';
+				break;
+			}
+
+			rtval = 0;
+			break;
+		}
+	}
+
+	FreeSample(MenuSnd);
+	FreeSample(FlashSnd);
+	ClearScr();
+	SetPalette(Palette);
+	InitInteract();
+	memfree(pa);
+	return rtval;
 }
 
 

diff --git a/signus/src/mainmenu.h b/signus/src/mainmenu.h
@@ -31,7 +31,11 @@ MAINMENU : Vstupni menu hry - osetreni
 #ifndef _MAINMENU_H
 #define _MAINMENU_H
 
-
+#define MAINMENU_NEWGAME 0
+#define MAINMENU_LOADGAME 1
+#define MAINMENU_CREDITS 2
+#define MAINMENU_EXIT 3
+#define MAINMENU_MAX 3
 
 extern int DoMainMenu();
     // provadi vyber v menu a vraci prislusne hodnoty

diff --git a/signus/src/signus.cpp b/signus/src/signus.cpp
@@ -57,6 +57,7 @@
 
 #define LOADED_NORMAL 1
 #define LOADED_CRASH  2
+#define CRASH_RECOVERY 666
 
 
 /////////////////////////////// PROMNENE ////////////////////////////////
@@ -1314,13 +1315,13 @@ void signus_main() {
 
 	while (result != 3) {
 		if (crash) {
-			result = 666;
+			result = CRASH_RECOVERY;
 		} else {
 			result = DoMainMenu();
 		}
 
 		switch (result) {
-		case 0:
+		case MAINMENU_NEWGAME:
 			PlayAnimation("intro2");
 			ActualMission = 1;
 			if (getenv("HELLMASTER")) {
@@ -1330,7 +1331,9 @@ void signus_main() {
 			while (RunSignus(FALSE));
 			break;
 
-		case 1: ActualMission = -1;
+		case MAINMENU_LOADGAME:
+			ActualMission = -1;
+
 			if (!LoadGame()) {
 				break;
 			}
@@ -1343,7 +1346,9 @@ void signus_main() {
 
 			break;
 
-		case 666:     // signus nacten v CrashLoad() --> server chce rovnou spustit AI...
+		case CRASH_RECOVERY:
+			// Game loaded from crash autosave => start enemy turn
+			// immediately
 			fs = LOADED_CRASH;
 			crash = FALSE;
 
@@ -1353,11 +1358,11 @@ void signus_main() {
 
 			break;
 
-		case 2:
+		case MAINMENU_CREDITS:
 			ShowCredits();
 			break;
 
-		case 3:
+		case MAINMENU_EXIT:
 			break;
 		}
 	}