[Scummvm-cvs-logs] scummvm master -> 4232610c20d652aec84bab014e9ba93d4b07db44
fuzzie
fuzzie at fuzzie.org
Fri Nov 4 12:32:26 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4232610c20 COMPOSER: Don't pass first param for V1 mouse events.
Commit: 4232610c20d652aec84bab014e9ba93d4b07db44
https://github.com/scummvm/scummvm/commit/4232610c20d652aec84bab014e9ba93d4b07db44
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-11-04T04:31:03-07:00
Commit Message:
COMPOSER: Don't pass first param for V1 mouse events.
Changed paths:
engines/composer/composer.cpp
diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index c2ebed3..1fa21a5 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) {
More information about the Scummvm-git-logs
mailing list