From a47446600afaca54521527f1bdc1ac034fd7cfbd Mon Sep 17 00:00:00 2001 From: Max Horn Date: Thu, 20 Dec 2007 14:26:03 +0000 Subject: get rid of unused globals svn-id: r29916 --- engines/agi/agi.cpp | 16 ++-------------- engines/agi/agi.h | 3 --- engines/agi/preagi.cpp | 3 --- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index 412b19fb17..33a1f669c3 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -114,20 +114,11 @@ void AgiEngine::processEvents() { g_mouse.y = event.mouse.y; break; case Common::EVENT_KEYDOWN: - _keyControl = 0; - _keyAlt = 0; - if (event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == Common::KEYCODE_d) { _console->attach(); break; } - if (event.kbd.flags & Common::KBD_CTRL) - _keyControl = 1; - - if (event.kbd.flags & Common::KBD_ALT) - _keyAlt = 1; - switch (key = event.kbd.keycode) { case Common::KEYCODE_LEFT: case Common::KEYCODE_KP4: @@ -232,9 +223,9 @@ void AgiEngine::processEvents() { key = event.kbd.ascii; break; } - if (_keyControl) + if (event.kbd.flags & Common::KBD_CTRL) key = (key & ~0x20) - 0x40; - else if (_keyAlt) + else if (event.kbd.flags & Common::KBD_ALT) key = scancodeTable[(key & ~0x20) - 0x41] << 8; else if (event.kbd.flags & Common::KBD_SHIFT) key = event.kbd.ascii; @@ -634,9 +625,6 @@ AgiEngine::AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : AgiBas _keyQueueStart = 0; _keyQueueEnd = 0; - _keyControl = 0; - _keyAlt = 0; - _allowSynthetic = false; g_tickTimer = 0; diff --git a/engines/agi/agi.h b/engines/agi/agi.h index 86e6901c71..b63095f9fd 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -755,9 +755,6 @@ public: int16 p4, int16 p5, int16 p6, int16 p7); void releaseImageStack(); - int _keyControl; - int _keyAlt; - Console *_console; int agiInit(); diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp index b356223936..5bdab8a801 100644 --- a/engines/agi/preagi.cpp +++ b/engines/agi/preagi.cpp @@ -94,9 +94,6 @@ PreAgiEngine::PreAgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : _keyQueueStart = 0; _keyQueueEnd = 0; - _keyControl = 0; - _keyAlt = 0; - _allowSynthetic = false; g_tickTimer = 0; -- cgit v1.2.3