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

- commented stuff out to make it compile.

Browse source
This commit is contained in:
Christoph Oelckers 2019-12-13 00:19:16 +01:00
parent 30304341a5
commit 4d28940d2f
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/sw/src/game.cpp
View file

@ -2660,7 +2660,7 @@ void Control()
void _Assert(const char *expr, const char *strFile, unsigned uLine)
{
buildprintf(ds, "Assertion failed: %s %s, line %u", expr, strFile, uLine);
debug_break();
//debug_break();
TerminateGame();
@ -3358,7 +3358,7 @@ SWBOOL DoQuickSave(short save_num)
SWBOOL DoQuickLoad()
{
KB_ClearKeysDown();
//KB_ClearKeysDown();
PauseAction();
@ -3480,13 +3480,13 @@ FunctionKeys(PLAYERp pp)
inputState.SetKeyStatus(sc_Escape);
if (QuickLoadNum < 0)
{
KEY_PRESSED(KEYSC_ESC) = 1;
//KEY_PRESSED(KEYSC_ESC) = 1;
ControlPanelType = ct_savemenu;
}
else
{
KB_ClearKeysDown();
KB_FlushKeyboardQueue();
//KB_ClearKeysDown();
//KB_FlushKeyboardQueue();
DoQuickSave(QuickLoadNum);
ResumeAction();
}
@ -3502,7 +3502,7 @@ FunctionKeys(PLAYERp pp)
{
if (QuickLoadNum < 0)
{
KEY_PRESSED(KEYSC_ESC) = 1;
//KEY_PRESSED(KEYSC_ESC) = 1;
ControlPanelType = ct_loadmenu;
}
else
@ -4299,13 +4299,14 @@ void getinput(SW_PACKET *loc)
SET(loc->bits, prev_weapon + 1);
}
/*
if (buttonMap.ButtonDown(gamefunc_Alt_Weapon_Mode))
{
buttonMap.ClearButton(gamefunc_Alt_Weapon_Mode);
USERp u = User[pp->PlayerSprite];
short const which_weapon = u->WeaponNum + 1;
SET(loc->bits, which_weapon);
}
}*/
inv_hotkey = 0;
if (buttonMap.ButtonDown(gamefunc_Med_Kit))

2
source/sw/src/menus.cpp
View file

@ -881,7 +881,7 @@ static int MNU_SelectButtonFunction(const char *buttonname, int *currentfunc)
else if (I_MenuDown())
{
I_MenuDownClear();
*currentfunc = min(NUMGAMEFUNCTIONS, *currentfunc + 1);
//*currentfunc = min(NUMGAMEFUNCTIONS, *currentfunc + 1);
}