libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 12:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GNAP: Change two variables to bool, remove two useless variables

Browse Source
This commit is contained in:
Strangerke 2016-05-31 23:03:43 +02:00
parent 6c1e59cf44
commit 56569c84a1
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/gnap/gnap.cpp
View File

@ -264,11 +264,11 @@ void GnapEngine::updateEvents() {
_debugger->onFrame();
}
_keyPressState[event.kbd.keycode] = 1;
_keyDownState[event.kbd.keycode] = 1;
_keyPressState[event.kbd.keycode] = true;
_keyDownState[event.kbd.keycode] = true;
break;
case Common::EVENT_KEYUP:
_keyDownState[event.kbd.keycode] = 0;
_keyDownState[event.kbd.keycode] = false;
break;
case Common::EVENT_MOUSEMOVE:
_mousePos = event.mouse;
@ -988,21 +988,19 @@ void GnapEngine::screenEffect(int dir, byte r, byte g, byte b) {
}
bool GnapEngine::isKeyStatus1(int key) {
return _keyPressState[key] != 0;
return _keyPressState[key];
}
bool GnapEngine::isKeyStatus2(int key) {
return _keyDownState[key] != 0;
return _keyDownState[key];
}
void GnapEngine::clearKeyStatus1(int key) {
_keyPressState[key] = 0;
_keyDownState[key] = 0;
_keyPressState[key] = false;
_keyDownState[key] = false;
}
void GnapEngine::clearAllKeyStatus1() {
_keyStatus1[0] = 0;
_keyStatus1[1] = 0;
memset(_keyPressState, 0, sizeof(_keyPressState));
memset(_keyDownState, 0, sizeof(_keyDownState));
}

6
engines/gnap/gnap.h
View File

@ -253,8 +253,8 @@ public:
int _lastUpdateClock;
bool _gameDone;
byte _keyPressState[512];
byte _keyDownState[512];
bool _keyPressState[512];
bool _keyDownState[512];
bool _isPaused;
Graphics::Surface *_pauseSprite;
@ -263,8 +263,6 @@ public:
MouseButtonState _mouseButtonState;
MouseButtonState _mouseClickState;
uint32 _keyStatus1[2];
bool _sceneSavegameLoaded, _wasSavegameLoaded;
Graphics::Surface *_backgroundSurface;