diff options
Diffstat (limited to 'engines/draci')
-rw-r--r-- | engines/draci/draci.cpp | 22 | ||||
-rw-r--r-- | engines/draci/mouse.cpp | 11 | ||||
-rw-r--r-- | engines/draci/mouse.h | 5 |
3 files changed, 2 insertions, 36 deletions
diff --git a/engines/draci/draci.cpp b/engines/draci/draci.cpp index 70e19d1dd1..c21f087479 100644 --- a/engines/draci/draci.cpp +++ b/engines/draci/draci.cpp @@ -235,28 +235,6 @@ void DraciEngine::handleEvents() { _game->inventoryInit(); } break; - case Common::KEYCODE_LCTRL: - debugC(6, kDraciGeneralDebugLevel, "Left Ctrl down"); - _mouse->downModifier(0); - break; - case Common::KEYCODE_RCTRL: - debugC(6, kDraciGeneralDebugLevel, "Right Ctrl down"); - _mouse->downModifier(1); - break; - default: - break; - } - break; - case Common::EVENT_KEYUP: - switch (event.kbd.keycode) { - case Common::KEYCODE_LCTRL: - debugC(6, kDraciGeneralDebugLevel, "Left Ctrl up"); - _mouse->upModifier(0); - break; - case Common::KEYCODE_RCTRL: - debugC(6, kDraciGeneralDebugLevel, "Right Ctrl up"); - _mouse->upModifier(1); - break; default: break; } diff --git a/engines/draci/mouse.cpp b/engines/draci/mouse.cpp index 2d30f1f21f..f5eb2bbf4d 100644 --- a/engines/draci/mouse.cpp +++ b/engines/draci/mouse.cpp @@ -34,7 +34,6 @@ Mouse::Mouse(DraciEngine *vm) { _y = 0; _lButton = false; _rButton = false; - _modifierState = 0; _cursorType = kNormalCursor; _vm = vm; } @@ -42,14 +41,8 @@ Mouse::Mouse(DraciEngine *vm) { void Mouse::handleEvent(Common::Event event) { switch (event.type) { case Common::EVENT_LBUTTONDOWN: - // TODO: remove _modifierState, since right click can be achieved via Cmd - if (!(_modifierState & 3)) { - debugC(6, kDraciGeneralDebugLevel, "Left button down (x: %u y: %u)", _x, _y); - _lButton = true; - } else { // any Ctrl pressed - debugC(6, kDraciGeneralDebugLevel, "Ctrl-Left button down (x: %u y: %u)", _x, _y); - _rButton = true; - } + debugC(6, kDraciGeneralDebugLevel, "Left button down (x: %u y: %u)", _x, _y); + _lButton = true; break; case Common::EVENT_LBUTTONUP: diff --git a/engines/draci/mouse.h b/engines/draci/mouse.h index 82a577b9d6..629a7634d5 100644 --- a/engines/draci/mouse.h +++ b/engines/draci/mouse.h @@ -62,17 +62,12 @@ public: void lButtonSet(bool state) { _lButton = state; } void rButtonSet(bool state) { _rButton = state; } - // Updates the current state of modifiers. The indexes are: 0=left Ctrl, 1=right Ctrl. - void downModifier(int index) { _modifierState |= 1 << index; } - void upModifier(int index) { _modifierState &= ~(1 << index); } - uint16 getPosX() const { return _x; } uint16 getPosY() const { return _y; } private: uint16 _x, _y; bool _lButton, _rButton; - int _modifierState; CursorType _cursorType; DraciEngine *_vm; }; |