From 21a2fc6894ef39dc3ad076b5136a4a4f184dcfd2 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 2 Nov 2013 20:51:35 -0400 Subject: TSAGE: Renamings for R2R Teal confrontation scene --- engines/tsage/ringworld2/ringworld2_scenes3.cpp | 10 +++++----- engines/tsage/ringworld2/ringworld2_scenes3.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'engines') diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index 8c8cb1e97c..dc47308359 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -2700,13 +2700,13 @@ void Scene3395::signal() { *--------------------------------------------------------------------------*/ Scene3400::Scene3400() { - _field157C = 0; + _soundFaded = false; } void Scene3400::synchronize(Serializer &s) { SceneExt::synchronize(s); - s.syncAsSint16LE(_field157C); + s.syncAsSint16LE(_soundFaded); } void Scene3400::postInit(SceneObjectList *OwnerList) { @@ -2714,7 +2714,7 @@ void Scene3400::postInit(SceneObjectList *OwnerList) { _sceneBounds = Rect(160, 0, 480, 200); loadScene(3400); - _field157C = 0; + _soundFaded = false; R2_GLOBALS._v558B6.set(60, 0, 260, 200); SceneExt::postInit(); R2_GLOBALS._sound1.play(317); @@ -2843,9 +2843,9 @@ void Scene3400::signal() { case 3307: case 3404: case 3408: - if (_field157C == 0) { + if (!_soundFaded) { R2_GLOBALS._sound2.fadeOut2(NULL); - _field157C = 1; + _soundFaded = true; } else { _sceneMode = 3308; _stripManager.start(3308, this); diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h index 188db7e87a..886fb1b014 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.h +++ b/engines/tsage/ringworld2/ringworld2_scenes3.h @@ -553,7 +553,7 @@ public: SceneActor _actor7; SceneActor _actor8; SequenceManager _sequenceManager; - int16 _field157C; + bool _soundFaded; Scene3400(); virtual void postInit(SceneObjectList *OwnerList = NULL); -- cgit v1.2.3