Merge branch 'gamespeed-explainer' into 'master'

Include gamespeed / GP difficulty on the Pause menu

See merge request KartKrew/Kart!2124
This commit is contained in:
Gunla 2024-03-17 21:56:09 +00:00
commit 5b20a5df60
2 changed files with 27 additions and 2 deletions

View file

@ -2513,7 +2513,7 @@ static void HU_DrawRankings(void)
else if (gametyperules & GTR_CIRCUIT)
{
V_DrawCenteredString(256, 8, 0, "GAME SPEED");
V_DrawCenteredString(256, 16, hilicol, kartspeed_cons_t[1+gamespeed].strvalue);
V_DrawCenteredString(256, 16, hilicol, (cv_4thgear.value) ? va("4th Gear") : kartspeed_cons_t[1+gamespeed].strvalue);
}
boolean completed[MAXPLAYERS];

View file

@ -5614,6 +5614,25 @@ void M_DrawExtras(void)
// INGAME / PAUSE MENUS
//
static char *M_GetGameplayMode(void)
{
if (grandprixinfo.gp == true)
{
if (grandprixinfo.masterbots)
return va("Master");
if (grandprixinfo.gamespeed == KARTSPEED_HARD)
return va("Hard");
if (grandprixinfo.gamespeed == KARTSPEED_NORMAL)
return va("Normal");
return va("Easy");
}
if (cv_4thgear.value)
return va("4th Gear!");
return va("Gear %d\n", gamespeed+1);
}
// PAUSE MAIN MENU
void M_DrawPause(void)
{
@ -5995,15 +6014,21 @@ void M_DrawPause(void)
if (smallroundpatch != NULL)
{
V_DrawMappedPatch(
24, 152 + offset/2,
24, 145 + offset/2,
0,
smallroundpatch,
NULL);
}
}
V_DrawCenteredMenuString(24, 167 + offset/2, V_YELLOWMAP, M_GetGameplayMode());
Y_RoundQueueDrawer(&standings, offset/2, false, false);
}
else
{
V_DrawMenuString(4, 188 + offset/2, V_YELLOWMAP, M_GetGameplayMode());
}
}
void M_DrawKickHandler(void)