[Scummvm-cvs-logs] SF.net SVN: scummvm:[40791] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat May 23 00:28:06 CEST 2009
Revision: 40791
http://scummvm.svn.sourceforge.net/scummvm/?rev=40791&view=rev
Author: lordhoto
Date: 2009-05-22 22:28:06 +0000 (Fri, 22 May 2009)
Log Message:
-----------
Handle mouse move events like the original.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/lol.h
Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp 2009-05-22 22:19:15 UTC (rev 40790)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2009-05-22 22:28:06 UTC (rev 40791)
@@ -324,12 +324,6 @@
}
break;
- case Common::EVENT_MOUSEMOVE: {
- Common::Point pos = getMousePos();
- _mouseX = pos.x;
- _mouseY = pos.y;
- } break;
-
case Common::EVENT_LBUTTONDOWN:
case Common::EVENT_LBUTTONUP: {
Common::Point pos = getMousePos();
@@ -407,7 +401,7 @@
case Common::EVENT_MOUSEMOVE:
if (screen()->isMouseVisible())
updateScreen = true;
- // fall through
+ break;
case Common::EVENT_LBUTTONUP:
case Common::EVENT_RBUTTONUP:
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2009-05-22 22:19:15 UTC (rev 40790)
+++ scummvm/trunk/engines/kyra/lol.cpp 2009-05-22 22:28:06 UTC (rev 40791)
@@ -640,27 +640,6 @@
_screen->setMouseCursor(0, 0, _itemIconShapes[0]);
}
-int LoLEngine::checkInput(Button *buttonList, bool mainLoop) {
- int mx = _mouseX;
- int my = _mouseY;
-
- int inputFlag = KyraEngine_v1::checkInput(buttonList, mainLoop);
-
- if (!inputFlag) {
- // This fixes a bug with some interactive sequences (like the inn where you mee Timothy).
- // In the original code Mouse position variables are only updated when mouse button
- // or keyboard events get triggered.
-
- // TODO/FIXME: Check whether this is the correct way to do it in KYRA, too. In this case a
- // fix could be added to KyraEngine_v1::checkInput() and the virtual stuff would not be
- // necessary.
- _mouseX = mx;
- _mouseY = my;
- }
-
- return inputFlag;
-}
-
void LoLEngine::setMouseCursorToIcon(int icon) {
_gameFlags[15] |= 0x200;
int i = _itemProperties[_itemsInPlay[_itemInHand].itemPropertyIndex].shpIndex;
Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h 2009-05-22 22:19:15 UTC (rev 40790)
+++ scummvm/trunk/engines/kyra/lol.h 2009-05-22 22:28:06 UTC (rev 40791)
@@ -306,8 +306,6 @@
void updateEnvironmentalSfx(int soundId);
// mouse
- int checkInput(Button *buttonList, bool mainLoop = false);
-
void setMouseCursorToIcon(int icon);
void setMouseCursorToItemInHand();
uint8 *getItemIconShapePtr(int index);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list