OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/ZDoom/gzdoom into gzdoom-update-4-12-1

Browse source
This commit is contained in:
Rachael Alexanderson 2024-04-21 11:05:59 -04:00
commit 112c6cbccf
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
90 changed files with 1227 additions and 834 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/menu/doommenu.cpp
View file

@ -206,7 +206,7 @@ bool M_SetSpecialMenu(FName& menu, int param)
if ((gameinfo.flags & GI_SHAREWARE) && param > 0)
{
// Only Doom and Heretic have multi-episode shareware versions.
M_StartMessage(GStrings("SWSTRING"), 1);
M_StartMessage(GStrings.GetString("SWSTRING"), 1);
return false;
}
@ -221,7 +221,7 @@ bool M_SetSpecialMenu(FName& menu, int param)
LastSkill = param;
const char *msg = AllSkills[param].MustConfirmText.GetChars();
if (*msg==0) msg = GStrings("NIGHTMARE");
if (*msg==0) msg = GStrings.GetString("NIGHTMARE");
M_StartMessage (msg, 0, NAME_StartgameConfirmed);
return false;
}
@ -247,7 +247,7 @@ bool M_SetSpecialMenu(FName& menu, int param)
if (!usergame || (players[consoleplayer].health <= 0 && !multiplayer) || gamestate != GS_LEVEL)
{
// cannot save outside the game.
M_StartMessage (GStrings("SAVEDEAD"), 1);
M_StartMessage (GStrings.GetString("SAVEDEAD"), 1);
return false;
}
@ -392,11 +392,11 @@ CCMD (menu_quit)
{
if (msg[1] == '*')
{
EndString = GStrings(msg + 2);
EndString = GStrings.GetString(msg + 2);
}
else
{
EndString.Format("%s\n\n%s", GStrings(msg + 1), GStrings("DOSY"));
EndString.Format("%s\n\n%s", GStrings.GetString(msg + 1), GStrings.GetString("DOSY"));
}
}
else EndString = gameinfo.quitmessages[messageindex];
@ -428,7 +428,7 @@ CCMD (menu_quit)
void ActivateEndGameMenu()
{
FString tempstring = GStrings(netgame ? "NETEND" : "ENDGAME");
FString tempstring = GStrings.GetString(netgame ? "NETEND" : "ENDGAME");
DMenu *newmenu = CreateMessageBoxMenu(CurrentMenu, tempstring.GetChars(), 0, false, NAME_None, []()
{
M_ClearMenus();
@ -501,7 +501,7 @@ CCMD (quicksave)
S_Sound(CHAN_VOICE, CHANF_UI, "menu/activate", snd_menuvolume, ATTN_NONE);
FString tempstring = GStrings("QSPROMPT");
FString tempstring = GStrings.GetString("QSPROMPT");
tempstring.Substitute("%s", savegameManager.quickSaveSlot->SaveTitle.GetChars());
DMenu *newmenu = CreateMessageBoxMenu(CurrentMenu, tempstring.GetChars(), 0, false, NAME_None, []()
@ -525,7 +525,7 @@ CCMD (quickload)
if (netgame)
{
M_StartControlPanel(true);
M_StartMessage (GStrings("QLOADNET"), 1);
M_StartMessage (GStrings.GetString("QLOADNET"), 1);
return;
}
@ -544,7 +544,7 @@ CCMD (quickload)
G_LoadGame(savegameManager.quickSaveSlot->Filename.GetChars());
return;
}
FString tempstring = GStrings("QLPROMPT");
FString tempstring = GStrings.GetString("QLPROMPT");
tempstring.Substitute("%s", savegameManager.quickSaveSlot->SaveTitle.GetChars());
M_StartControlPanel(true);
@ -568,13 +568,13 @@ CCMD (togglemessages)
{
if (show_messages)
{
Printf(TEXTCOLOR_RED "%s\n", GStrings("MSGOFF"));
Printf(TEXTCOLOR_RED "%s\n", GStrings.GetString("MSGOFF"));
show_messages = false;
}
else
{
show_messages = true;
Printf(TEXTCOLOR_RED "%s\n", GStrings("MSGON"));
Printf(TEXTCOLOR_RED "%s\n", GStrings.GetString("MSGON"));
}
}
@ -712,7 +712,7 @@ void M_StartupEpisodeMenu(FNewGameStartup *gs)
continue; // We do not measure patch based entries. They are assumed to fit
}
const char *c = AllEpisodes[i].mEpisodeName.GetChars();
if (*c == '$') c = GStrings(c + 1);
if (*c == '$') c = GStrings.GetString(c + 1);
int textwidth = ld->mFont->StringWidth(c);
int textright = posx + textwidth;
if (posx + textright > 320) posx = max(0, 320 - textright);
@ -1262,7 +1262,7 @@ void M_StartupSkillMenu(FNewGameStartup *gs)
continue;
}
const char *c = pItemText ? pItemText->GetChars() : skill.MenuName.GetChars();
if (*c == '$') c = GStrings(c + 1);
if (*c == '$') c = GStrings.GetString(c + 1);
int textwidth = ld->mFont->StringWidth(c);
int textright = posx + textwidth;
if (posx + textright > 320) posx = max(0, 320 - textright);