[Scummvm-cvs-logs] scummvm master -> a6ae7d485622b5332914b077a1100cf299f8358d
Strangerke
Strangerke at scummvm.org
Wed Nov 27 07:40:14 CET 2013
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:
a6ae7d4856 TSAGE: R2R - Fix waitFrames in scene 1337
Commit: a6ae7d485622b5332914b077a1100cf299f8358d
https://github.com/scummvm/scummvm/commit/a6ae7d485622b5332914b077a1100cf299f8358d
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-26T22:39:16-08:00
Commit Message:
TSAGE: R2R - Fix waitFrames in scene 1337
Changed paths:
engines/tsage/ringworld2/ringworld2_scenes1.cpp
engines/tsage/ringworld2/ringworld2_scenes1.h
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index f03fb90..87639b5 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2264,16 +2264,18 @@ void Scene1337::Action1337::subD18B5(int resNum, int stripNum, int frameNum) {
warning("STUBBED: Action1337::subD18B5()");
}
-void Scene1337::Action1337::waitFrames(int32 skipCount) {
- warning("STUBBED: waitFrames()");
-/*
+void Scene1337::Action1337::waitFrames(int32 frameCount) {
uint32 firstFrameNumber = g_globals->_events.getFrameNumber();
- uint32 tmpFrameNumber = firstFrameNumber;
+ uint32 curFrame = firstFrameNumber;
+ uint32 destFrame = firstFrameNumber + frameCount;
- while (tmpFrameNumber < firstFrameNumber + skipCount)
- tmpFrameNumber = g_globals->_events.getFrameNumber();
-*/
- warning("_eventManager.waitEvent(-1)");
+ while (curFrame < destFrame) {
+ TsAGE::Event event;
+ g_globals->_events.getEvent(event);
+ curFrame = g_globals->_events.getFrameNumber();
+ }
+
+ // CHECKME: The original is calling _eventManager.waitEvent();
}
void Scene1337::Action1::signal() {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index ecc4c1f..ed66f98 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -214,7 +214,7 @@ class Scene1337 : public SceneExt {
class Action1337: public Action {
public:
void subD18B5(int resNum, int stripNum, int frameNum);
- void waitFrames(int32 skipCount);
+ void waitFrames(int32 frameCount);
};
class Action1: public Action1337 {
More information about the Scummvm-git-logs
mailing list