diff options
| author | Strangerke | 2012-07-04 23:18:29 +0200 |
|---|---|---|
| committer | Strangerke | 2012-07-05 21:31:42 +0200 |
| commit | b1cc34a080ff31fb22ab466624a99c0cdaeb51c1 (patch) | |
| tree | 552f5fb61662d7679ae420aebe92e01ae6806e6b /engines/cge/cge_main.cpp | |
| parent | 112f03390d308af60d9c5f5e9f29c30988d2e968 (diff) | |
| download | scummvm-rg350-b1cc34a080ff31fb22ab466624a99c0cdaeb51c1.tar.gz scummvm-rg350-b1cc34a080ff31fb22ab466624a99c0cdaeb51c1.tar.bz2 scummvm-rg350-b1cc34a080ff31fb22ab466624a99c0cdaeb51c1.zip | |
CGE: Remove hack used to store keycode in CGEEvent
Diffstat (limited to 'engines/cge/cge_main.cpp')
| -rw-r--r-- | engines/cge/cge_main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp index fbe37e58a0..a70e32de7e 100644 --- a/engines/cge/cge_main.cpp +++ b/engines/cge/cge_main.cpp @@ -518,8 +518,8 @@ Square::Square(CGEEngine *vm) : Sprite(vm, NULL), _vm(vm) { setShapeList(MB); } -void Square::touch(uint16 mask, int x, int y) { - Sprite::touch(mask, x, y); +void Square::touch(uint16 mask, int x, int y, Common::KeyCode keyCode) { + Sprite::touch(mask, x, y, keyCode); if (mask & kMouseLeftUp) { _vm->XZ(_x + x, _y + y).cell() = 0; _vm->_commandHandlerTurbo->addCommand(kCmdKill, -1, 0, this); @@ -758,11 +758,11 @@ void System::funTouch() { _funDel = n; } -void System::touch(uint16 mask, int x, int y) { +void System::touch(uint16 mask, int x, int y, Common::KeyCode keyCode) { funTouch(); if (mask & kEventKeyb) { - if (x == Common::KEYCODE_ESCAPE) { + if (keyCode == Common::KEYCODE_ESCAPE) { // The original was calling keyClick() // The sound is uselessly annoying and noisy, so it has been removed _vm->killText(); @@ -926,7 +926,7 @@ void CGEEngine::optionTouch(int opt, uint16 mask) { } #pragma argsused -void Sprite::touch(uint16 mask, int x, int y) { +void Sprite::touch(uint16 mask, int x, int y, Common::KeyCode keyCode) { _vm->_sys->funTouch(); if ((mask & kEventAttn) != 0) |