[Scummvm-cvs-logs] scummvm master -> 4b110493c1778967f0696136d6da459c948c4bb4

Strangerke Strangerke at scummvm.org
Sat Nov 30 19:04:50 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:
4b110493c1 TSAGE: R2R - Add missing shouldquit in loop, fix build


Commit: 4b110493c1778967f0696136d6da459c948c4bb4
    https://github.com/scummvm/scummvm/commit/4b110493c1778967f0696136d6da459c948c4bb4
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-30T10:03:46-08:00

Commit Message:
TSAGE: R2R - Add missing shouldquit in loop, fix build

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 c3b2308..ebba329 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2267,7 +2267,7 @@ void Scene1337::Action1337::waitFrames(int32 frameCount) {
 	uint32 curFrame = firstFrameNumber;
 	uint32 destFrame = firstFrameNumber + frameCount;
 
-	while (curFrame < destFrame) {
+	while ((curFrame < destFrame) && !g_vm->shouldQuit()) {
 		TsAGE::Event event;
 		g_globals->_events.getEvent(event);
 		curFrame = g_globals->_events.getFrameNumber();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 6b0f885..5059554 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -314,8 +314,8 @@ public:
 	int _field4246;
 	int _field4248;
 	int _field424A;
-	int _field424C;
-	int _field424E;
+	int _instructionsDisplayedFl;
+	int _instructionsWaitCount;
 
 	SceneObject _upperDisplayCard[8];
 	SceneObject _lowerDisplayCard[8];






More information about the Scummvm-git-logs mailing list