Fixing annoying item use after save game (#192)

This commit is contained in:
CommonLoon102 2019-09-30 05:43:54 +00:00 committed by Christoph Oelckers
parent 5687b4c02e
commit ce61c38660

View file

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