diff options
| author | Strangerke | 2013-11-30 19:03:46 +0100 |
|---|---|---|
| committer | Strangerke | 2013-11-30 19:03:46 +0100 |
| commit | 4b110493c1778967f0696136d6da459c948c4bb4 (patch) | |
| tree | 93846ba70e1597b8260327ae9179d73203a08a11 /engines/tsage | |
| parent | 1f2685e40ca71eaee8c15b52dcff2ae36b8f8909 (diff) | |
| download | scummvm-rg350-4b110493c1778967f0696136d6da459c948c4bb4.tar.gz scummvm-rg350-4b110493c1778967f0696136d6da459c948c4bb4.tar.bz2 scummvm-rg350-4b110493c1778967f0696136d6da459c948c4bb4.zip | |
TSAGE: R2R - Add missing shouldquit in loop, fix build
Diffstat (limited to 'engines/tsage')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.cpp | 2 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index c3b23087c7..ebba329762 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 6b0f8859a5..5059554311 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]; |