zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed compile errors in menu code.

Browse source
This commit is contained in:
Christoph Oelckers 2019-11-30 10:03:20 +01:00
parent 3c4c8af20c
commit d5c3991c2e
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -417,7 +417,7 @@ protected:
FString EndString; FString EndString;
EndString.Format("%s" TEXTCOLOR_WHITE "%s" TEXTCOLOR_NORMAL "?\n\n%s", EndString.Format("%s" TEXTCOLOR_WHITE "%s" TEXTCOLOR_NORMAL "?\n\n%s",
GStrings("MNU_DELETESG"), manager.GetSavegame(Selected)->SaveTitle.GetChars(), GStrings("PRESSYN")); GStrings("MNU_DELETESG"), manager.GetSavegame(Selected)->SaveTitle.GetChars(), GStrings("PRESSYN"));
M_StartMessage(EndString, 0); M_StartMessage(EndString, 0, -1);
} }
return true; return true;
} }

4
source/common/menu/menu.h
View file

@ -98,10 +98,12 @@ enum EMenuSounds : int
AdvanceSound, AdvanceSound,
BackSound, BackSound,
CloseSound, CloseSound,
PageSound PageSound,
ChangeSound ChangeSound
}; };
EXTERN_CVAR(Bool, menu_sounds)
struct event_t; struct event_t;
class FTexture; class FTexture;
class FFont; class FFont;

8
source/common/menu/menudef.cpp
View file

@ -879,11 +879,11 @@ static void ParseOptionMenuBody(FScanner &sc, FOptionMenuDescriptor *desc)
{ {
sc.MustGetString(); sc.MustGetString();
FString label = sc.String; FString label = sc.String;
bool cr = false; EColorRange cr = OptionSettings.mFontColorHeader;
if (sc.CheckString(",")) if (sc.CheckString(","))
{ {
sc.MustGetNumber(); sc.MustGetNumber();
cr = !!sc.Number; cr = sc.Number? OptionSettings.mFontColorHeader : OptionSettings.mFontColor; // fixme!
} }
FOptionMenuItem *it = new FOptionMenuItemStaticText(label, cr); FOptionMenuItem *it = new FOptionMenuItemStaticText(label, cr);
desc->mItems.Push(it); desc->mItems.Push(it);
@ -898,11 +898,11 @@ static void ParseOptionMenuBody(FScanner &sc, FOptionMenuDescriptor *desc)
sc.MustGetStringName(","); sc.MustGetStringName(",");
sc.MustGetString(); sc.MustGetString();
FName action = sc.String; FName action = sc.String;
bool cr = false; EColorRange cr = OptionSettings.mFontColorHeader;
if (sc.CheckString(",")) if (sc.CheckString(","))
{ {
sc.MustGetNumber(); sc.MustGetNumber();
cr = !!sc.Number; cr = sc.Number ? OptionSettings.mFontColorHeader : OptionSettings.mFontColor; // fixme!
} }
FOptionMenuItem *it = new FOptionMenuItemStaticTextSwitchable(label, label2, action, cr); FOptionMenuItem *it = new FOptionMenuItemStaticTextSwitchable(label, label2, action, cr);
desc->mItems.Push(it); desc->mItems.Push(it);

3
source/common/menu/optionmenuitems.h
View file

@ -34,6 +34,7 @@
#include "v_text.h" #include "v_text.h"
#include "v_draw.h" #include "v_draw.h"
#include "gstrings.h" #include "gstrings.h"
#include "v_font.h"
void M_DrawConText (int color, int x, int y, const char *str); void M_DrawConText (int color, int x, int y, const char *str);
@ -901,7 +902,7 @@ public:
M_MenuSound(AdvanceSound); M_MenuSound(AdvanceSound);
mEditName = GetCVarString(); mEditName = GetCVarString();
mEntering = true; mEntering = true;
DMenu* input = new DTextEnterMenu ( DMenu::CurrentMenu, mEditName, sizeof mEditName, 2, fromcontroller ); DMenu* input = new DTextEnterMenu(DMenu::CurrentMenu, NewSmallFont, mEditName, 256, fromcontroller );
M_ActivateMenu( input ); M_ActivateMenu( input );
return true; return true;
} }

2
source/duke3d/src/d_menu.cpp
View file

@ -507,8 +507,6 @@ void GameInterface::CustomMenuSelection(int menu, int item)
VM_OnEventWithReturn(EVENT_NEWGAMECUSTOM, -1, myconnectindex, menu); VM_OnEventWithReturn(EVENT_NEWGAMECUSTOM, -1, myconnectindex, menu);
} }
EXTERN_CVAR(Bool, menu_sounds)
void GameInterface::StartGame(FGameStartup& gs) void GameInterface::StartGame(FGameStartup& gs)
{ {
int32_t skillsound = PISTOL_BODYHIT; int32_t skillsound = PISTOL_BODYHIT;

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

@ -426,7 +426,6 @@ bool GameInterface::CanSave()
return true; return true;
} }
EXTERN_CVAR(Bool, menu_sounds)
void GameInterface::StartGame(FGameStartup& gs) void GameInterface::StartGame(FGameStartup& gs)
{ {
int32_t skillsound = PISTOL_BODYHIT; int32_t skillsound = PISTOL_BODYHIT;