aboutsummaryrefslogtreecommitdiff
path: root/engines/mortevielle/alert.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2012-01-21 20:06:08 +1100
committerStrangerke2012-04-06 08:20:30 +0200
commit90e076a36a25e79262848d0820f04d4fe1e5cc8f (patch)
tree0172fa7a5a8af12f949c8a5fa5233055c3b953e6 /engines/mortevielle/alert.cpp
parent35b502612bebeec8007385f6eb1496b5755b4f31 (diff)
downloadscummvm-rg350-90e076a36a25e79262848d0820f04d4fe1e5cc8f.tar.gz
scummvm-rg350-90e076a36a25e79262848d0820f04d4fe1e5cc8f.tar.bz2
scummvm-rg350-90e076a36a25e79262848d0820f04d4fe1e5cc8f.zip
MORTEVIELLE: Merge the _mouseButtons and clic variables
The original separate implementation was causing problems with the mouse click variable remaining set too long.
Diffstat (limited to 'engines/mortevielle/alert.cpp')
-rw-r--r--engines/mortevielle/alert.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/mortevielle/alert.cpp b/engines/mortevielle/alert.cpp
index 36170361c3..6a380b2155 100644
--- a/engines/mortevielle/alert.cpp
+++ b/engines/mortevielle/alert.cpp
@@ -28,6 +28,7 @@
#include "common/str.h"
#include "mortevielle/alert.h"
#include "mortevielle/level15.h"
+#include "mortevielle/mortevielle.h"
#include "mortevielle/mouse.h"
#include "mortevielle/sprint.h"
@@ -150,7 +151,7 @@ int do_alert(Common::String str_, int n) {
while (keypressed())
dumi = get_ch(); // input >> kbd >> dumi;
- clic = false;
+ g_vm->setMouseClick(false);
decod(str_, nbcase, nblig, nbcol, chaine, cas);
sauvecr(50, succ(int, nligne) << 4);
@@ -242,8 +243,8 @@ int do_alert(Common::String str_, int n) {
}
test3 = (cy > 95) && (cy < 105) && (((cx > limit[1][1]) && (cx < limit[1][2]))
|| ((cx > limit[2][1]) && (cx < limit[2][2])));
- } while (!clic);
- clic = false;
+ } while (!g_vm->getMouseClick());
+ g_vm->setMouseClick(false);
hide_mouse();
if (! test3) {
quoi = n;