diff options
| author | Max Horn | 2007-03-14 12:32:42 +0000 |
|---|---|---|
| committer | Max Horn | 2007-03-14 12:32:42 +0000 |
| commit | 93e316bec745f92c1970c39b92d438b4840753c4 (patch) | |
| tree | 470c729212527299fd8170d23b9f660836efc288 /engines/sky/sky.cpp | |
| parent | 68a6598fe3ced6609a4f6e873be0f07f037e4895 (diff) | |
| download | scummvm-rg350-93e316bec745f92c1970c39b92d438b4840753c4.tar.gz scummvm-rg350-93e316bec745f92c1970c39b92d438b4840753c4.tar.bz2 scummvm-rg350-93e316bec745f92c1970c39b92d438b4840753c4.zip | |
Fix for bug #1656880 (BASS: mouse initialized wrong in control panel)
svn-id: r26130
Diffstat (limited to 'engines/sky/sky.cpp')
| -rw-r--r-- | engines/sky/sky.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index 375f484d8e..056189c54e 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -263,8 +263,6 @@ int SkyEngine::go() { _systemVars.quitGame = false; - _mouseX = GAME_SCREEN_WIDTH / 2; - _mouseY = GAME_SCREEN_HEIGHT / 2; _keyFlags = _keyPressed = 0; uint16 result = 0; @@ -303,7 +301,7 @@ int SkyEngine::go() { _lastSaveTime += 30 * 1000; // try again in 30 secs } _skySound->checkFxQueue(); - _skyMouse->mouseEngine((uint16)_mouseX, (uint16)_mouseY); + _skyMouse->mouseEngine(); handleKey(); if (_systemVars.paused) { do { @@ -532,22 +530,15 @@ void SkyEngine::delay(int32 amount) { break; case OSystem::EVENT_MOUSEMOVE: if (!(_systemVars.systemFlags & SF_MOUSE_LOCKED)) { - _mouseX = event.mouse.x; - _mouseY = event.mouse.y; + _skyMouse->mouseMoved(event.mouse.x, event.mouse.y); } break; case OSystem::EVENT_LBUTTONDOWN: -#ifdef PALMOS_MODE - _mouseX = event.mouse.x; - _mouseY = event.mouse.y; -#endif + _skyMouse->mouseMoved(event.mouse.x, event.mouse.y); _skyMouse->buttonPressed(2); break; case OSystem::EVENT_RBUTTONDOWN: -#ifdef PALMOS_MODE - _mouseX = event.mouse.x; - _mouseY = event.mouse.y; -#endif + _skyMouse->mouseMoved(event.mouse.x, event.mouse.y); _skyMouse->buttonPressed(1); break; case OSystem::EVENT_QUIT: |