[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.85,1.86 sky.cpp,1.166,1.167
Chris Apers
chrilith at users.sourceforge.net
Mon Dec 20 08:50:11 CET 2004
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26721
Modified Files:
control.cpp sky.cpp
Log Message:
- Change mouse position on click
- Remove timimg code which slow down PalmOS port
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- control.cpp 16 Dec 2004 10:56:11 -0000 1.85
+++ control.cpp 20 Dec 2004 16:48:48 -0000 1.86
@@ -1505,6 +1505,10 @@
_mouseY = event.mouse.y;
break;
case OSystem::EVENT_LBUTTONDOWN:
+#ifdef __PALM_OS__
+ _mouseX = event.mouse.x;
+ _mouseY = event.mouse.y;
+#endif
_mouseClicked = true;
break;
case OSystem::EVENT_LBUTTONUP:
@@ -1521,6 +1525,7 @@
}
}
+#ifndef __PALM_OS__
uint this_delay = 20; // 1?
#ifdef _WIN32_WCE
this_delay = 10;
@@ -1529,7 +1534,7 @@
this_delay = amount;
if (this_delay > 0) _system->delayMillis(this_delay);
-
+#endif
cur = _system->getMillis();
} while (cur < start + amount);
}
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- sky.cpp 16 Dec 2004 04:22:32 -0000 1.166
+++ sky.cpp 20 Dec 2004 16:48:49 -0000 1.167
@@ -423,9 +423,17 @@
}
break;
case OSystem::EVENT_LBUTTONDOWN:
+#ifdef __PALM_OS__
+ _mouseX = event.mouse.x;
+ _mouseY = event.mouse.y;
+#endif
_skyMouse->buttonPressed(2);
break;
case OSystem::EVENT_RBUTTONDOWN:
+#ifdef __PALM_OS__
+ _mouseX = event.mouse.x;
+ _mouseY = event.mouse.y;
+#endif
_skyMouse->buttonPressed(1);
break;
case OSystem::EVENT_QUIT:
@@ -436,8 +444,11 @@
break;
}
}
+
+#ifndef __PALM_OS__
if (amount > 0)
_system->delayMillis((amount > 10) ? 10 : amount);
+#endif
} while (_system->getMillis() < start + amount);
}
More information about the Scummvm-git-logs
mailing list