aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra.cpp
diff options
context:
space:
mode:
authorOystein Eftevaag2006-03-19 05:55:26 +0000
committerOystein Eftevaag2006-03-19 05:55:26 +0000
commite636a25a3313da26225e0f5518a67f54092e78e1 (patch)
tree0aa02962d3e408c10b69b7d666d66ad0b1695f7a /engines/kyra/kyra.cpp
parent6632a4df53bd6cd94d85057ceae10f14108a67e4 (diff)
downloadscummvm-rg350-e636a25a3313da26225e0f5518a67f54092e78e1.tar.gz
scummvm-rg350-e636a25a3313da26225e0f5518a67f54092e78e1.tar.bz2
scummvm-rg350-e636a25a3313da26225e0f5518a67f54092e78e1.zip
Adds button press animations to the menu, and resets the cursor when the Dialog of Death pops up. Also, mouse clicks are now registered on button up instead of button down, as in the original
svn-id: r21377
Diffstat (limited to 'engines/kyra/kyra.cpp')
-rw-r--r--engines/kyra/kyra.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index f41ef760ed..e2f28cd8b8 100644
--- a/engines/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
@@ -683,6 +683,10 @@ void KyraEngine::mainLoop() {
_deathHandler = 0xFF;
snd_playWanderScoreViaMap(0, 1);
snd_playSoundEffect(49);
+ _screen->hideMouse();
+ _screen->setMouseCursor(1, 1, _shapes[4]);
+ destroyMouseItem();
+ _screen->showMouse();
buttonMenuCallback(0);
}
@@ -727,7 +731,6 @@ void KyraEngine::delay(uint32 amount, bool update, bool isMainLoop) {
char saveLoadSlot[20];
char savegameName[14];
- _mousePressFlag = false;
uint32 start = _system->getMillis();
do {
while (_system->pollEvent(event)) {
@@ -765,6 +768,9 @@ void KyraEngine::delay(uint32 amount, bool update, bool isMainLoop) {
break;
case OSystem::EVENT_LBUTTONDOWN:
_mousePressFlag = true;
+ break;
+ case OSystem::EVENT_LBUTTONUP:
+ _mousePressFlag = false;
if (_abortWalkFlag2) {
_abortWalkFlag = true;
_mouseX = event.mouse.x;