teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed Redneck Rampage ingame menu and added selection validation to the load menu.

Browse source
This commit is contained in:
Christoph Oelckers 2019-11-30 23:59:22 +01:00
parent 06d5705ae6
commit 0fc439a969
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/common/menu/loadsavemenu.cpp
View file

@ -165,6 +165,7 @@ protected:
if (savegameManager.SavegameCount() > 0) if (savegameManager.SavegameCount() > 0)
{ {
if (Selected > savegameManager.SavegameCount()) Selected = 0;
FString text = (Selected == -1 || !savegameManager.GetSavegame(Selected)->bOldVersion) ? GStrings("MNU_NOPICTURE") : GStrings("MNU_DIFFVERSION"); FString text = (Selected == -1 || !savegameManager.GetSavegame(Selected)->bOldVersion) ? GStrings("MNU_NOPICTURE") : GStrings("MNU_DIFFVERSION");
int textlen = NewSmallFont->StringWidth(text) * CleanXfac; int textlen = NewSmallFont->StringWidth(text) * CleanXfac;

1
source/rr/src/d_menu.cpp
View file

@ -151,6 +151,7 @@ static void Menu_DrawTopBar(const DVector2 &origin)
static void Menu_DrawTopBarCaption(const char* caption, const DVector2& origin) static void Menu_DrawTopBarCaption(const char* caption, const DVector2& origin)
{ {
static char t[64]; static char t[64];
if (*caption == '$') caption = GStrings(caption + 1);
size_t const srclen = strlen(caption); size_t const srclen = strlen(caption);
size_t const dstlen = min(srclen, ARRAY_SIZE(t) - 1); size_t const dstlen = min(srclen, ARRAY_SIZE(t) - 1);
memcpy(t, caption, dstlen); memcpy(t, caption, dstlen);

4
wadsrc/static/demolition/menudef.txt
View file

@ -74,7 +74,7 @@ LISTMENU "MainMenu"
LISTMENU "IngameMenu" LISTMENU "IngameMenu"
{ {
ScriptId 50 ScriptId 50
ifgame(Duke, Nam, WW2GI, Fury) ifgame(Duke, Nam, WW2GI, Fury, Redneck, RedneckRides)
{ {
ifgame(fury) ifgame(fury)
{ {
@ -121,7 +121,7 @@ LISTMENU "IngameMenu"
NativeTextItem "$MNU_LOADGAME", "l", "LoadGameMenu" NativeTextItem "$MNU_LOADGAME", "l", "LoadGameMenu"
NativeTextItem "$MNU_SAVEGAME", "s", "SaveGameMenu" NativeTextItem "$MNU_SAVEGAME", "s", "SaveGameMenu"
NativeTextItem "$MNU_OPTIONS", "o", "OptionsMenu" NativeTextItem "$MNU_OPTIONS", "o", "OptionsMenu"
NativeTextItem "$MNU_COOLSTUFF", "h", "HelpMenu" NativeTextItem "$MNU_CREDITS", "c", "CreditsMenu"
NativeTextItem "$MNU_QUITGAME", "q", "QuitMenu" NativeTextItem "$MNU_QUITGAME", "q", "QuitMenu"
} }
} }