zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-04 12:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing annoying item use after save game (#192)

Browse source
This commit is contained in:
CommonLoon102 2019-09-30 05:43:54 +00:00 committed by Christoph Oelckers
parent 5687b4c02e
commit ce61c38660
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/blood/src/gamemenu.cpp
View file

@ -2071,20 +2071,18 @@ bool CGameMenuItemZEditBitmap::Event(CGameMenuEvent &event)
gSaveGameActive = true; gSaveGameActive = true;
return true; return true;
case kMenuEventEnter: case kMenuEventEnter:
if (!at35) if (!at35 || bScan)
{ {
if (at30) if (at30)
at30(this, &event); at30(this, &event);
gSaveGameActive = false;
return false;
}
if (bScan) if (bScan)
{ {
if (at30)
at30(this, &event);
bScan = 0; bScan = 0;
gGameMenuMgr.m_bScanning = false; gGameMenuMgr.m_bScanning = false;
}
gSaveGameActive = false; gSaveGameActive = false;
KB_ClearKeyDown(sc_Enter);
KB_ClearKeyDown(sc_kpad_Enter);
return false; return false;
} }
strncpy(buffer, at20, at24); strncpy(buffer, at20, at24);
@ -2102,7 +2100,7 @@ bool CGameMenuItemZEditBitmap::Event(CGameMenuEvent &event)
case kMenuEventSpace: case kMenuEventSpace:
{ {
char key; char key;
if (event.at2 < 128) if (bScan && event.at2 < 128)
{ {
if (keystatus[sc_LeftShift] || keystatus[sc_RightShift]) if (keystatus[sc_LeftShift] || keystatus[sc_RightShift])
key = g_keyAsciiTableShift[event.at2]; key = g_keyAsciiTableShift[event.at2];