diff options
| author | Paul Gilbert | 2013-11-02 20:41:11 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-11-02 20:41:11 -0400 |
| commit | 7f5aab983cedb5eda62abaa64da590c035b20f2e (patch) | |
| tree | f832a54f8c5c99e466aa6ad8702e0a84a54d2900 /engines/tsage/ringworld2 | |
| parent | 6adee124b84a2a5b0ac5fc0418848998f997b013 (diff) | |
| download | scummvm-rg350-7f5aab983cedb5eda62abaa64da590c035b20f2e.tar.gz scummvm-rg350-7f5aab983cedb5eda62abaa64da590c035b20f2e.tar.bz2 scummvm-rg350-7f5aab983cedb5eda62abaa64da590c035b20f2e.zip | |
TSAGE: Renamings and removoal of unused variable for R2R circular walkways
Diffstat (limited to 'engines/tsage/ringworld2')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.cpp | 14 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.h | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index 0ba97b3031..755aa14b9f 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -1737,8 +1737,7 @@ void Scene3350::signal() { void Scene3375::synchronize(Serializer &s) { SceneExt::synchronize(s); - s.syncAsSint16LE(_field1488); - s.syncAsSint16LE(_field1492); + s.syncAsSint16LE(_newSceneMode); for (int i = 0; i < 4; ++i) s.syncAsSint16LE(_sceneAreas[i]); } @@ -1931,7 +1930,7 @@ void Scene3375::DownExit::changeScene() { R2_GLOBALS._player.disableControl(CURSOR_ARROW); scene->_sceneMode = 3377; - scene->_field1488 = 3381; + scene->_newSceneMode = 3381; if (R2_GLOBALS._walkwaySceneNumber != 0) { R2_GLOBALS._walkRegions.enableRegion(2); @@ -1953,7 +1952,7 @@ void Scene3375::RightExit::changeScene() { R2_GLOBALS._player.disableControl(CURSOR_ARROW); scene->_sceneMode = 3378; - scene->_field1488 = 3380; + scene->_newSceneMode = 3380; if (R2_GLOBALS._walkwaySceneNumber != 0) { R2_GLOBALS._walkRegions.enableRegion(2); @@ -1967,7 +1966,7 @@ void Scene3375::RightExit::changeScene() { } Scene3375::Scene3375() { - _field1488 = _field1492 = 0; + _newSceneMode = 0; _sceneAreas[0] = 3376; _sceneAreas[1] = 3377; @@ -2181,8 +2180,9 @@ void Scene3375::signal() { case 3377: // No break on purpose case 3378: - _sceneMode = _field1488; - _field1488 = 0; + _sceneMode = _newSceneMode; + _newSceneMode = 0; + _companion1._effect = 6; _companion1._shade = 4; _companion2._effect = 6; diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h index 9ab621251c..0802a29895 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.h +++ b/engines/tsage/ringworld2/ringworld2_scenes3.h @@ -437,9 +437,8 @@ public: DownExit _downExit; RightExit _rightExit; SequenceManager _sequenceManager; - int _field1488; + int _newSceneMode; int _sceneAreas[4]; - int _field1492; Scene3375(); virtual void postInit(SceneObjectList *OwnerList = NULL); |