From 201194e493928b18829de4797a4aa2e6eb314c2a Mon Sep 17 00:00:00 2001 From: VelocitOni Date: Thu, 29 Jun 2023 04:32:57 -0400 Subject: [PATCH] Added all of Chengi's new menu backgrounds Replaced a lot of NULLs with the lumps for Chengi's new BGs (Battle Mode is still missing) --- src/menus/main-1.c | 4 ++-- src/menus/play-1.c | 4 ++-- src/menus/play-local-1.c | 6 +++--- src/menus/play-local-race-1.c | 6 +++--- src/menus/play-local-race-difficulty.c | 14 +++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/menus/main-1.c b/src/menus/main-1.c index e00b10b85..f7108a606 100644 --- a/src/menus/main-1.c +++ b/src/menus/main-1.c @@ -29,8 +29,8 @@ menuitem_t MainMenu[] = "Check out some bonus features.", "MENUI001", {.routine = M_InitExtras}, 0, 0}, - {IT_STRING, "Options", - "Configure your controls, settings, and preferences.", NULL, + {IT_STRING | IT_CALL, "Options", + "Configure your controls, settings, and preferences.", "MENUI010", {.routine = M_InitOptions}, 0, 0}, {IT_STRING | IT_CALL, "Quit", diff --git a/src/menus/play-1.c b/src/menus/play-1.c index 53ca72dc3..135227634 100644 --- a/src/menus/play-1.c +++ b/src/menus/play-1.c @@ -7,10 +7,10 @@ menuitem_t PLAY_MainMenu[] = { {IT_STRING | IT_CALL, "Local Play", "Play only on this computer.", - NULL, {.routine = M_SetupGametypeMenu}, 0, 0}, + "MENUI002", {.routine = M_SetupGametypeMenu}, 0, 0}, {IT_STRING | IT_CALL, "Online", NULL, - NULL, {.routine = M_MPOptSelectInit}, /*M_MPRoomSelectInit,*/ 0, 0}, + "MENUI009", {.routine = M_MPOptSelectInit}, /*M_MPRoomSelectInit,*/ 0, 0}, {IT_STRING | IT_CALL, "Back", NULL, NULL, {.routine = M_GoBack}, 0, 0}, }; diff --git a/src/menus/play-local-1.c b/src/menus/play-local-1.c index 21f127e0a..8ad6805e0 100644 --- a/src/menus/play-local-1.c +++ b/src/menus/play-local-1.c @@ -7,16 +7,16 @@ menuitem_t PLAY_GamemodesMenu[] = { {IT_STRING | IT_CALL, "Race", "A contest to see who's the fastest of them all!", - NULL, {.routine = M_SetupRaceMenu}, 0, 0}, + "MENUI003", {.routine = M_SetupRaceMenu}, 0, 0}, {IT_STRING | IT_CALL, "Battle", "It's last kart standing in this free-for-all!", "MENIMG00", {.routine = M_LevelSelectInit}, 0, GT_BATTLE}, {IT_STRING | IT_CALL, "Prisons", "Bust up all of the Prison Eggs in record time!", - NULL, {.routine = M_LevelSelectInit}, 1, GT_BATTLE}, + "MENUI007", {.routine = M_LevelSelectInit}, 1, GT_BATTLE}, {IT_STRING | IT_CALL, "Special", "Strike your target and secure the prize!", - NULL, {.routine = M_LevelSelectInit}, 1, GT_SPECIAL}, + "MENUI008", {.routine = M_LevelSelectInit}, 1, GT_SPECIAL}, {IT_STRING | IT_CALL, "Back", NULL, NULL, {.routine = M_GoBack}, 0, 0}, }; diff --git a/src/menus/play-local-race-1.c b/src/menus/play-local-race-1.c index d0965b8ad..799420520 100644 --- a/src/menus/play-local-race-1.c +++ b/src/menus/play-local-race-1.c @@ -7,13 +7,13 @@ menuitem_t PLAY_RaceGamemodesMenu[] = { {IT_STRING | IT_CALL, "Grand Prix", "Compete for the best rank over five rounds!", - NULL, {.routine = M_SetupDifficultySelect}, 0, 0}, + "MENUI004", {.routine = M_SetupDifficultySelect}, 0, 0}, {IT_STRING | IT_CALL, "Match Race", "Play by your own rules in a specialized, single race!", - "MENIMG01", {.routine = M_SetupDifficultySelect}, 1, 0}, + "MENUI005", {.routine = M_SetupDifficultySelect}, 1, 0}, {IT_STRING | IT_CALL, "Time Attack", "Record your best time on any track!", - NULL, {.routine = M_LevelSelectInit}, 1, GT_RACE}, + "MENUI006", {.routine = M_LevelSelectInit}, 1, GT_RACE}, {IT_STRING | IT_CALL, "Back", NULL, NULL, {.routine = M_GoBack}, 0, 0}, }; diff --git a/src/menus/play-local-race-difficulty.c b/src/menus/play-local-race-difficulty.c index 600176816..d9c00994e 100644 --- a/src/menus/play-local-race-difficulty.c +++ b/src/menus/play-local-race-difficulty.c @@ -8,26 +8,26 @@ menuitem_t PLAY_RaceDifficulty[] = { // For GP {IT_STRING | IT_CVAR, "Difficulty", "Select the game difficulty", - NULL, {.cvar = &cv_dummygpdifficulty}, 0, 0}, + "MENUI004", {.cvar = &cv_dummygpdifficulty}, 0, 0}, // Match Race {IT_STRING | IT_CVAR, "Difficulty", "Select the game speed", - NULL, {.cvar = &cv_dummykartspeed}, 0, 0}, + "MENUI005", {.cvar = &cv_dummykartspeed}, 0, 0}, // DISABLE THAT OPTION OUTSIDE OF MATCH RACE {IT_STRING2 | IT_CVAR, "CPU", "Set the difficulty of CPU players.", - NULL, {.cvar = &cv_dummymatchbots}, 0, 0}, + "MENUI005", {.cvar = &cv_dummymatchbots}, 0, 0}, {IT_STRING2 | IT_CVAR, "Racers", "Sets the number of racers, including players and CPU.", - NULL, {.cvar = &cv_maxplayers}, 0, 0}, + "MENUI005", {.cvar = &cv_maxplayers}, 0, 0}, {IT_STRING2 | IT_CVAR, "Encore", "Enable or disable Encore mode", - NULL, {.cvar = &cv_dummygpencore}, 0, 0}, + "MENUI005", {.cvar = &cv_dummygpencore}, 0, 0}, // For GP - {IT_STRING | IT_CALL, "Cup Select", "Go on and select a cup!", NULL, {.routine = M_LevelSelectInit}, 2, GT_RACE}, + {IT_STRING | IT_CALL, "Cup Select", "Go on and select a cup!", "MENUI004", {.routine = M_LevelSelectInit}, 2, GT_RACE}, // Match Race - {IT_STRING | IT_CALL, "Map Select", "Go on and select a race track!", NULL, {.routine = M_LevelSelectInit}, 0, GT_RACE}, + {IT_STRING | IT_CALL, "Map Select", "Go on and select a race track!", "MENUI005", {.routine = M_LevelSelectInit}, 0, GT_RACE}, {IT_STRING | IT_CALL, "Back", NULL, NULL, {.routine = M_GoBack}, 0, 0}, };