aboutsummaryrefslogtreecommitdiff
path: root/engines/composer
diff options
context:
space:
mode:
authorAlyssa Milburn2011-11-04 12:31:03 +0100
committerAlyssa Milburn2011-11-04 12:31:03 +0100
commit4232610c20d652aec84bab014e9ba93d4b07db44 (patch)
treef8060f6d3a282e4a72fdbc0b5d343d9cfdaa1a2e /engines/composer
parent9da55d09bff4562b5b24486e10bae339f25b8eff (diff)
downloadscummvm-rg350-4232610c20d652aec84bab014e9ba93d4b07db44.tar.gz
scummvm-rg350-4232610c20d652aec84bab014e9ba93d4b07db44.tar.bz2
scummvm-rg350-4232610c20d652aec84bab014e9ba93d4b07db44.zip
COMPOSER: Don't pass first param for V1 mouse events.
Diffstat (limited to 'engines/composer')
-rw-r--r--engines/composer/composer.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index c2ebed32b6..1fa21a5494 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -222,11 +222,13 @@ void ComposerEngine::onMouseDown(const Common::Point &pos) {
if (!button)
return;
+ debug(3, "mouseDown on button id %d", button->_id);
+
// TODO: other buttons?
uint16 buttonsDown = 1; // MK_LBUTTON
uint16 spriteId = sprite ? sprite->_id : 0;
- runScript(button->_scriptId, button->_id, buttonsDown, spriteId);
+ runScript(button->_scriptId, (getGameType() == GType_ComposerV1) ? 0 : button->_id, buttonsDown, spriteId);
}
void ComposerEngine::onMouseMove(const Common::Point &pos) {
@@ -242,10 +244,10 @@ void ComposerEngine::onMouseMove(const Common::Point &pos) {
const Button *button = getButtonFor(sprite, pos);
if (_lastButton != button) {
if (_lastButton && _lastButton->_scriptIdRollOff)
- runScript(_lastButton->_scriptIdRollOff, _lastButton->_id, buttonsDown, 0);
+ runScript(_lastButton->_scriptIdRollOff, (getGameType() == GType_ComposerV1) ? 0 : _lastButton->_id, buttonsDown, 0);
_lastButton = button;
if (_lastButton && _lastButton->_scriptIdRollOn)
- runScript(_lastButton->_scriptIdRollOn, _lastButton->_id, buttonsDown, 0);
+ runScript(_lastButton->_scriptIdRollOn, (getGameType() == GType_ComposerV1) ? 0 : _lastButton->_id, buttonsDown, 0);
}
if (_mouseSpriteId) {