aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/myst.cpp
diff options
context:
space:
mode:
authorBastien Bouclet2010-11-29 20:53:14 +0000
committerBastien Bouclet2010-11-29 20:53:14 +0000
commit8da42b4221bd4763abc80397307b5807d14c89f0 (patch)
treeedd4475c555ea5fb928762089882b778aed39aef /engines/mohawk/myst.cpp
parentb4913548d0b4e9e510653bf72aadd1e856663788 (diff)
downloadscummvm-rg350-8da42b4221bd4763abc80397307b5807d14c89f0.tar.gz
scummvm-rg350-8da42b4221bd4763abc80397307b5807d14c89f0.tar.bz2
scummvm-rg350-8da42b4221bd4763abc80397307b5807d14c89f0.zip
MOHAWK: Don't change current resource when dragging
svn-id: r54607
Diffstat (limited to 'engines/mohawk/myst.cpp')
-rw-r--r--engines/mohawk/myst.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index 448334492c..ee010e5d80 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -67,6 +67,7 @@ MohawkEngine_Myst::MohawkEngine_Myst(OSystem *syst, const MohawkGameDescription
_curCard = 0;
_needsUpdate = false;
_curResource = -1;
+ _dragResource = 0;
_gfx = NULL;
_console = NULL;
@@ -294,7 +295,10 @@ Common::Error MohawkEngine_Myst::run() {
switch (event.type) {
case Common::EVENT_MOUSEMOVE:
_needsUpdate = true;
- checkCurrentResource();
+ // Keep the same resource when dragging
+ if (!_dragResource) {
+ checkCurrentResource();
+ }
if (_curResource >= 0 && _mouseClicked) {
debug(2, "Sending mouse move event to resource %d\n", _curResource);
_resources[_curResource]->handleMouseDrag(&event.mouse);
@@ -482,6 +486,7 @@ void MohawkEngine_Myst::changeToCard(uint16 card) {
// TODO: Handle Script Resources
// Make sure we have the right cursor showing
+ _dragResource = 0;
_curResource = -1;
checkCurrentResource();