[Scummvm-cvs-logs] SF.net SVN: scummvm: [26176] scummvm/trunk/engines/sky/sky.cpp
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Mar 17 17:22:52 CET 2007
Revision: 26176
http://scummvm.svn.sourceforge.net/scummvm/?rev=26176&view=rev
Author: fingolfin
Date: 2007-03-17 09:22:51 -0700 (Sat, 17 Mar 2007)
Log Message:
-----------
SKY: respect the SF_MOUSE_LOCKED flag upon mouse clicks, too
Modified Paths:
--------------
scummvm/trunk/engines/sky/sky.cpp
Modified: scummvm/trunk/engines/sky/sky.cpp
===================================================================
--- scummvm/trunk/engines/sky/sky.cpp 2007-03-17 16:08:29 UTC (rev 26175)
+++ scummvm/trunk/engines/sky/sky.cpp 2007-03-17 16:22:51 UTC (rev 26176)
@@ -511,6 +511,7 @@
void SkyEngine::delay(int32 amount) {
+ Common::EventManager *eventMan = _system->getEventManager();
OSystem::Event event;
uint32 start = _system->getMillis();
@@ -520,7 +521,6 @@
amount = 0;
do {
- Common::EventManager *eventMan = _system->getEventManager();
while (eventMan->pollEvent(event)) {
switch (event.type) {
case OSystem::EVENT_KEYDOWN:
@@ -536,11 +536,15 @@
}
break;
case OSystem::EVENT_LBUTTONDOWN:
- _skyMouse->mouseMoved(event.mouse.x, event.mouse.y);
+ if (!(_systemVars.systemFlags & SF_MOUSE_LOCKED)) {
+ _skyMouse->mouseMoved(event.mouse.x, event.mouse.y);
+ }
_skyMouse->buttonPressed(2);
break;
case OSystem::EVENT_RBUTTONDOWN:
- _skyMouse->mouseMoved(event.mouse.x, event.mouse.y);
+ if (!(_systemVars.systemFlags & SF_MOUSE_LOCKED)) {
+ _skyMouse->mouseMoved(event.mouse.x, event.mouse.y);
+ }
_skyMouse->buttonPressed(1);
break;
case OSystem::EVENT_QUIT:
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