[Scummvm-cvs-logs] scummvm master -> 8dec805d852cff58d3ff52c4d8051ac0a33f93be
dreammaster
dreammaster at scummvm.org
Sat Dec 17 05:39:10 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:
8dec805d85 TSAGE: Bugfix for #3460485 - Animation running too slowly
Commit: 8dec805d852cff58d3ff52c4d8051ac0a33f93be
https://github.com/scummvm/scummvm/commit/8dec805d852cff58d3ff52c4d8051ac0a33f93be
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-12-16T20:38:29-08:00
Commit Message:
TSAGE: Bugfix for #3460485 - Animation running too slowly
Changed paths:
engines/tsage/events.cpp
engines/tsage/events.h
diff --git a/engines/tsage/events.cpp b/engines/tsage/events.cpp
index ac08997..152570b 100644
--- a/engines/tsage/events.cpp
+++ b/engines/tsage/events.cpp
@@ -386,7 +386,7 @@ bool EventsClass::isCursorVisible() const {
*/
void EventsClass::delay(int numFrames) {
while (_frameNumber < (_prevDelayFrame + numFrames)) {
- uint32 delayAmount = CLIP(_priorFrameTime + GAME_FRAME_TIME - g_system->getMillis(),
+ uint32 delayAmount = CLIP(_priorFrameTime + GAME_SCRIPT_TIME - g_system->getMillis(),
(uint32)0, (uint32)GAME_FRAME_TIME);
if (delayAmount > 0)
g_system->delayMillis(delayAmount);
diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index 303c220..fe4d3ec 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -36,9 +36,12 @@ enum EventType {EVENT_NONE = 0, EVENT_BUTTON_DOWN = 1, EVENT_BUTTON_UP = 2, EVEN
enum ButtonShiftFlags {BTNSHIFT_LEFT = 0, BTNSHIFT_RIGHT = 3, BTNSHIFT_MIDDLE = 4};
-// Intrinisc game delay between execution frames. This runs at 60Hz
-#define GAME_FRAME_RATE 60
-#define GAME_FRAME_TIME (1000 / 60)
+// Intrinisc game delay between execution frames
+#define GAME_FRAME_RATE 50
+#define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
+
+#define GAME_SCRIPT_RATE 80
+#define GAME_SCRIPT_TIME (1000 / GAME_SCRIPT_RATE)
class GfxManager;
More information about the Scummvm-git-logs
mailing list