From 23314494d0a0a6858dc8b278e83bdb137917440e Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 5 Nov 2013 08:41:23 -0500 Subject: TSAGE: Renaming of effect 6, and removed unused effect 4 entry --- engines/tsage/core.h | 3 +- engines/tsage/ringworld2/ringworld2_scenes1.cpp | 30 ++++++++-------- engines/tsage/ringworld2/ringworld2_scenes3.cpp | 48 ++++++++++++------------- 3 files changed, 41 insertions(+), 40 deletions(-) diff --git a/engines/tsage/core.h b/engines/tsage/core.h index 79ce1e8a90..183af096dd 100644 --- a/engines/tsage/core.h +++ b/engines/tsage/core.h @@ -466,8 +466,9 @@ enum AnimateMode {ANIM_MODE_NONE = 0, ANIM_MODE_1 = 1, ANIM_MODE_2 = 2, ANIM_MOD ANIM_MODE_9 = 9 }; +// Actor effect enumeration used in Return to Ringworld 2 enum Effect { EFFECT_NONE = 0, EFFECT_SHADED = 1, EFFECT_2 = 2, EFFECT_3 = 3, - EFFECT_4 = 4, EFFECT_SHADOW_MAP = 5, EFFECT_6 = 6 }; + EFFECT_SHADOW_MAP = 5, EFFECT_SHADED2 = 6 }; class SceneObject; diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index 1b75ed4fdd..9ee95b13c6 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -1038,12 +1038,12 @@ void Scene1100::signal() { break; case 5: _runningGuy1.postInit(); - _runningGuy1._effect = EFFECT_6; + _runningGuy1._effect = EFFECT_SHADED2; _runningGuy1.setup(1103, 3, 1); _runningGuy1._moveRate = 30; _runningGuy2.postInit(); - _runningGuy2._effect = EFFECT_6; + _runningGuy2._effect = EFFECT_SHADED2; _runningGuy2.setup(1103, 4, 1); _runningGuy2._moveRate = 25; @@ -7814,7 +7814,7 @@ void Scene1550::postInit(SceneObjectList *OwnerList) { _stripManager.addSpeaker(&_seekerSpeaker); R2_GLOBALS._player.postInit(); - R2_GLOBALS._player._effect = EFFECT_6; + R2_GLOBALS._player._effect = EFFECT_SHADED2; if (R2_GLOBALS._player._characterIndex == R2_QUINN) R2_GLOBALS._player.setup(1500, 3, 1); @@ -9020,7 +9020,7 @@ void Scene1550::enterArea() { (R2_GLOBALS._scene1550JunkLocations[i + 2] != 0)) { tmpIdx = R2_GLOBALS._scene1550JunkLocations[i + 3]; _junk[di].postInit(); - _junk[di]._effect = EFFECT_6; + _junk[di]._effect = EFFECT_SHADED2; _junk[di]._shade = 0; _junk[di]._fieldA4 = tmpIdx; _junk[di]._junkNumber = i; @@ -9264,7 +9264,7 @@ void Scene1550::enterArea() { if (R2_GLOBALS._s1550PlayerArea[R2_QUINN] == R2_GLOBALS._s1550PlayerArea[R2_SEEKER]) { _companion.postInit(); - _companion._effect = EFFECT_6; + _companion._effect = EFFECT_SHADED2; _companion.changeZoom(-1); assert((_field419 >= 1550) && (_field419 <= 2008)); @@ -12005,8 +12005,8 @@ void Scene1850::postInit(SceneObjectList *OwnerList) { } if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1850) { - R2_GLOBALS._player._effect = EFFECT_6; - _companion._effect = EFFECT_6; + R2_GLOBALS._player._effect = EFFECT_SHADED2; + _companion._effect = EFFECT_SHADED2; if (R2_GLOBALS.getFlag(31)) { R2_GLOBALS._player._shade = 0; _companion._shade = 0; @@ -12042,7 +12042,7 @@ void Scene1850::postInit(SceneObjectList *OwnerList) { _actor3.setup(1853, 3, 1); _actor3.setPosition(Common::Point(122, 113)); _actor3.fixPriority(114); - _actor3._effect = EFFECT_6; + _actor3._effect = EFFECT_SHADED2; // Totally useless test if (R2_GLOBALS._player._characterIndex == R2_QUINN) { @@ -12056,7 +12056,7 @@ void Scene1850::postInit(SceneObjectList *OwnerList) { _actor4.setup(1853, 3, 2); _actor4.setPosition(Common::Point(139, 111)); _actor4.fixPriority(114); - _actor4._effect = EFFECT_6; + _actor4._effect = EFFECT_SHADED2; // Still totally useless test if (R2_GLOBALS._player._characterIndex == R2_QUINN) { @@ -12086,7 +12086,7 @@ void Scene1850::postInit(SceneObjectList *OwnerList) { _actor3.setup(1853, 3, 1); _actor3.setPosition(Common::Point(122, 113)); _actor3.fixPriority(114); - _actor3._effect = EFFECT_6; + _actor3._effect = EFFECT_SHADED2; // Totally useless test if (R2_GLOBALS._player._characterIndex == R2_QUINN) { @@ -12100,7 +12100,7 @@ void Scene1850::postInit(SceneObjectList *OwnerList) { _actor4.setup(1853, 3, 2); _actor4.setPosition(Common::Point(139, 111)); _actor4.fixPriority(114); - _actor4._effect = EFFECT_6; + _actor4._effect = EFFECT_SHADED2; // Again, useless test if (R2_GLOBALS._player._characterIndex == R2_QUINN) { @@ -12225,10 +12225,10 @@ void Scene1850::remove() { void Scene1850::signal() { switch (_sceneMode) { case 10: - R2_GLOBALS._player._effect = EFFECT_6; + R2_GLOBALS._player._effect = EFFECT_SHADED2; R2_GLOBALS._player._shade = 6; - _companion._effect = EFFECT_6; + _companion._effect = EFFECT_SHADED2; _companion._shade = 6; R2_GLOBALS._walkRegions.disableRegion(5); @@ -12407,7 +12407,7 @@ void Scene1850::signal() { break; case 1877: _actor3.postInit(); - _actor3._effect = EFFECT_6; + _actor3._effect = EFFECT_SHADED2; if (R2_GLOBALS._player._characterIndex == R2_QUINN) { _actor3.setDetails(1850, 28, -1, -1, 2, (SceneItem *)NULL); @@ -12416,7 +12416,7 @@ void Scene1850::signal() { } _actor4.postInit(); - _actor4._effect = EFFECT_6; + _actor4._effect = EFFECT_SHADED2; if (R2_GLOBALS._player._characterIndex == R2_QUINN) { _actor4.setDetails(1850, 29, -1, -1, 2, (SceneItem *)NULL); diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index 6eda26db2f..3f8f13d690 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -417,7 +417,7 @@ bool Scene3150::Toilet::startAction(CursorType action, Event &event) { case R2_PILLOW: R2_GLOBALS._player.disableControl(); scene->_water.postInit(); - scene->_water._effect = EFFECT_6; + scene->_water._effect = EFFECT_SHADED2; scene->_water._shade = 3; R2_GLOBALS._player.disableControl(); scene->_sceneMode = 3158; @@ -428,7 +428,7 @@ bool Scene3150::Toilet::startAction(CursorType action, Event &event) { (R2_INVENTORY.getObjectScene(R2_SUPERCONDUCTOR_WIRE) == 3150) && (R2_GLOBALS.getFlag(75))) { scene->_foodTray.postInit(); - scene->_foodTray._effect = EFFECT_6; + scene->_foodTray._effect = EFFECT_SHADED2; scene->_foodTray._shade = 3; scene->_foodTray.setDetails(3150, 30, -1, -1, 2, (SceneItem *)NULL); @@ -579,7 +579,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { _guard.postInit(); _guard.setup(3154, 1, 16); _guard.setPosition(Common::Point(104, 129)); - _guard._effect = EFFECT_6; + _guard._effect = EFFECT_SHADED2; _guard._shade = 3; _guard.setDetails(3150, 24, -1, -1, -1, (SceneItem *)NULL); } @@ -609,7 +609,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { } _water.fixPriority(110); _water.setPosition(Common::Point(83, 88)); - _water._effect = EFFECT_6; + _water._effect = EFFECT_SHADED2; _water._shade = 3; } else { _water.setup(3152, 7, 3); @@ -629,7 +629,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { _bulbOrWire.setup(3152, 7, 3); _bulbOrWire.setPosition(Common::Point(70, 55)); _bulbOrWire.fixPriority(111); - _bulbOrWire._effect = EFFECT_6; + _bulbOrWire._effect = EFFECT_SHADED2; _bulbOrWire._shade = 5; } @@ -639,7 +639,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { _foodTray.setup(3152, 7, 8); _foodTray.setPosition(Common::Point(82, 92)); _foodTray.fixPriority(111); - _foodTray._effect = EFFECT_6; + _foodTray._effect = EFFECT_SHADED2; _foodTray._shade = 3; } else { _foodTray.setup(3152, 7, 7); @@ -664,7 +664,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { case 0: _sceneMode = 3150; _guard.postInit(); - _guard._effect = EFFECT_6; + _guard._effect = EFFECT_SHADED2; _guard._shade = 5; setAction(&_sequenceManager, this, 3150, &R2_GLOBALS._player, &_guard, &_doorBars, NULL); break; @@ -689,12 +689,12 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { ++R2_GLOBALS._v56AA0; _sceneMode = 3156; _guard.postInit(); - _guard._effect = EFFECT_6; + _guard._effect = EFFECT_SHADED2; _guard._shade = 3; _doorBars.postInit(); _foodTray.postInit(); - _foodTray._effect = EFFECT_6; + _foodTray._effect = EFFECT_SHADED2; _foodTray._shade = 3; setAction(&_sequenceManager, this, 3156, &R2_GLOBALS._player, &_guard, &_doorBars, &_foodTray, NULL); @@ -1274,7 +1274,7 @@ void Scene3250::signal() { void Scene3250::dispatch() { if ((R2_GLOBALS._player._visage == 3250) && (R2_GLOBALS._player._strip == 3) && (R2_GLOBALS._player._effect == 0)) { - R2_GLOBALS._player._effect = EFFECT_6; + R2_GLOBALS._player._effect = EFFECT_SHADED2; R2_GLOBALS._player._shade = 6; } @@ -1356,7 +1356,7 @@ void Scene3255::dispatch() { else _ghoul1._effect = EFFECT_SHADED; } else { - _ghoul1._effect = EFFECT_6; + _ghoul1._effect = EFFECT_SHADED2; _ghoul1._shade = 6; } @@ -1366,7 +1366,7 @@ void Scene3255::dispatch() { else _ghoul2._effect = EFFECT_SHADED; } else { - _ghoul2._effect = EFFECT_6; + _ghoul2._effect = EFFECT_SHADED2; _ghoul2._shade = 6; } @@ -1376,14 +1376,14 @@ void Scene3255::dispatch() { else _ghoul3._effect = EFFECT_SHADED; } else { - _ghoul3._effect = EFFECT_6; + _ghoul3._effect = EFFECT_SHADED2; _ghoul3._shade = 6; } } if ((R2_GLOBALS._player._position.x > 250) && (R2_GLOBALS._player._shade == 1)) { - R2_GLOBALS._player._effect = EFFECT_6; - _quinn._effect = EFFECT_6; + R2_GLOBALS._player._effect = EFFECT_SHADED2; + _quinn._effect = EFFECT_SHADED2; } Scene::dispatch(); } @@ -1925,7 +1925,7 @@ void Scene3375::DownExit::changeScene() { Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene; _moving = false; - R2_GLOBALS._player._effect = EFFECT_6; + R2_GLOBALS._player._effect = EFFECT_SHADED2; R2_GLOBALS._player._shade = 4; R2_GLOBALS._player.disableControl(CURSOR_ARROW); @@ -1947,7 +1947,7 @@ void Scene3375::RightExit::changeScene() { Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene; _moving = false; - R2_GLOBALS._player._effect = EFFECT_6; + R2_GLOBALS._player._effect = EFFECT_SHADED2; R2_GLOBALS._player._shade = 4; R2_GLOBALS._player.disableControl(CURSOR_ARROW); @@ -2183,11 +2183,11 @@ void Scene3375::signal() { _sceneMode = _newSceneMode; _newSceneMode = 0; - _companion1._effect = EFFECT_6; + _companion1._effect = EFFECT_SHADED2; _companion1._shade = 4; - _companion2._effect = EFFECT_6; + _companion2._effect = EFFECT_SHADED2; _companion2._shade = 4; - _webbster._effect = EFFECT_6; + _webbster._effect = EFFECT_SHADED2; _webbster._shade = 4; enterArea(_sceneMode); break; @@ -2212,22 +2212,22 @@ void Scene3375::signal() { void Scene3375::dispatch() { if ((R2_GLOBALS._player._position.y >= 168) && (R2_GLOBALS._player._effect == 1)) - R2_GLOBALS._player._effect = EFFECT_6; + R2_GLOBALS._player._effect = EFFECT_SHADED2; else if ((R2_GLOBALS._player._position.y < 168) && (R2_GLOBALS._player._effect == 6)) R2_GLOBALS._player._effect = EFFECT_SHADED; if ((_companion1._position.y >= 168) && (_companion1._effect == 1)) - _companion1._effect = EFFECT_6; + _companion1._effect = EFFECT_SHADED2; else if ((_companion1._position.y < 168) && (_companion1._effect == 6)) _companion1._effect = EFFECT_SHADED; if ((_companion2._position.y >= 168) && (_companion2._effect == 1)) - _companion2._effect = EFFECT_6; + _companion2._effect = EFFECT_SHADED2; else if ((_companion2._position.y < 168) && (_companion2._effect == 6)) _companion2._effect = EFFECT_SHADED; if ((_webbster._position.y >= 168) && (_webbster._effect == 1)) - _webbster._effect = EFFECT_6; + _webbster._effect = EFFECT_SHADED2; else if ((_webbster._position.y < 168) && (_webbster._effect == 6)) _webbster._effect = EFFECT_SHADED; -- cgit v1.2.3