diff options
| author | Thierry Crozat | 2018-01-10 23:07:19 +0000 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-23 02:15:47 +0000 |
| commit | ac609c91dbb26111396abfc22016e91967dca6d9 (patch) | |
| tree | b72737958602854ec7690b74879d9b80bc20973e | |
| parent | 2a8cf41b33b6411fd4c4c9067d111eabec925206 (diff) | |
| download | scummvm-rg350-ac609c91dbb26111396abfc22016e91967dca6d9.tar.gz scummvm-rg350-ac609c91dbb26111396abfc22016e91967dca6d9.tar.bz2 scummvm-rg350-ac609c91dbb26111396abfc22016e91967dca6d9.zip | |
SUPERNOVA: Make _event a local variable
| -rw-r--r-- | engines/supernova/supernova.cpp | 21 | ||||
| -rw-r--r-- | engines/supernova/supernova.h | 1 |
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp index 177d581090..cb3a096f3a 100644 --- a/engines/supernova/supernova.cpp +++ b/engines/supernova/supernova.cpp @@ -218,20 +218,21 @@ void SupernovaEngine::updateEvents() { _gm->_mouseClicked = false; _gm->_keyPressed = false; - while (g_system->getEventManager()->pollEvent(_event)) { - switch (_event.type) { + Common::Event event; + while (g_system->getEventManager()->pollEvent(event)) { + switch (event.type) { case Common::EVENT_KEYDOWN: _gm->_keyPressed = true; - if (_event.kbd.keycode == Common::KEYCODE_d && - (_event.kbd.flags & Common::KBD_CTRL)) { + if (event.kbd.keycode == Common::KEYCODE_d && + (event.kbd.flags & Common::KBD_CTRL)) { _console->attach(); } - if (_event.kbd.keycode == Common::KEYCODE_x && - (_event.kbd.flags & Common::KBD_CTRL)) { + if (event.kbd.keycode == Common::KEYCODE_x && + (event.kbd.flags & Common::KBD_CTRL)) { // TODO: Draw exit box } - _gm->processInput(_event.kbd); + _gm->processInput(event.kbd); break; case Common::EVENT_LBUTTONUP: @@ -242,9 +243,9 @@ void SupernovaEngine::updateEvents() { _gm->_mouseClicked = true; // fallthrough case Common::EVENT_MOUSEMOVE: - _gm->_mouseClickType = _event.type; - _gm->_mouseX = _event.mouse.x; - _gm->_mouseY = _event.mouse.y; + _gm->_mouseClickType = event.type; + _gm->_mouseX = event.mouse.x; + _gm->_mouseY = event.mouse.y; if (_gm->_guiEnabled) _gm->processInput(); break; diff --git a/engines/supernova/supernova.h b/engines/supernova/supernova.h index 7cf6f543a9..8f0a8ee7a2 100644 --- a/engines/supernova/supernova.h +++ b/engines/supernova/supernova.h @@ -108,7 +108,6 @@ public: SoundSample _soundSamples[kAudioNumSamples]; Common::MemoryReadStream *_soundMusicIntro; Common::MemoryReadStream *_soundMusicOutro; - Common::Event _event; int _screenWidth; int _screenHeight; bool _allowLoadGame; |