diff options
author | Paul Gilbert | 2013-09-19 19:19:03 -0400 |
---|---|---|
committer | Paul Gilbert | 2013-09-19 19:19:03 -0400 |
commit | 5ea8e28d281f44d4f35edd7fbc4bc33a4ee7be90 (patch) | |
tree | 2ba8c970727bead8fdf2f85803449e5697fdd0f9 /engines/tsage/ringworld2 | |
parent | 5b23a251ceefaecdd4d46e1b27835adaf7dd7f99 (diff) | |
download | scummvm-rg350-5ea8e28d281f44d4f35edd7fbc4bc33a4ee7be90.tar.gz scummvm-rg350-5ea8e28d281f44d4f35edd7fbc4bc33a4ee7be90.tar.bz2 scummvm-rg350-5ea8e28d281f44d4f35edd7fbc4bc33a4ee7be90.zip |
TSAGE: Reversed all R2R enableRegion/disableRegion calls
Diffstat (limited to 'engines/tsage/ringworld2')
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 26 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.cpp | 152 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes2.cpp | 16 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.cpp | 142 |
4 files changed, 168 insertions, 168 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index 40e17b6ed9..3e5b230a05 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -5225,7 +5225,7 @@ void Scene500::postInit(SceneObjectList *OwnerList) { R2_GLOBALS._player._characterScene[R2_SEEKER] = 500; if (R2_GLOBALS._player._characterIndex == R2_QUINN) { - R2_GLOBALS._walkRegions.disableRegion(1); + R2_GLOBALS._walkRegions.enableRegion(1); _seeker.postInit(); _seeker._effect = 1; @@ -5239,9 +5239,9 @@ void Scene500::postInit(SceneObjectList *OwnerList) { _seeker.setup(R2_GLOBALS.getFlag(26) ? 1500 : 10, 1, 1); _seeker.setPosition(Common::Point(42, 151)); - R2_GLOBALS._walkRegions.disableRegion(1); - R2_GLOBALS._walkRegions.disableRegion(2); - R2_GLOBALS._walkRegions.disableRegion(3); + R2_GLOBALS._walkRegions.enableRegion(1); + R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.enableRegion(3); _seeker.setDetails(500, 37, 38, -1, 1, (SceneItem *)NULL); } @@ -5757,7 +5757,7 @@ void Scene600::postInit(SceneObjectList *OwnerList) { loadScene(600); SceneExt::postInit(); R2_GLOBALS.setFlag(39); - R2_GLOBALS._walkRegions.enableRegion(3); + R2_GLOBALS._walkRegions.disableRegion(3); _field412 = 0; // Initialize pixel map for the obscuring effect @@ -5907,10 +5907,10 @@ void Scene600::signal() { case 605: // After cloud is active R2_GLOBALS._player.enableControl(); - R2_GLOBALS._walkRegions.enableRegion(6); - R2_GLOBALS._walkRegions.enableRegion(7); - R2_GLOBALS._walkRegions.enableRegion(9); - R2_GLOBALS._walkRegions.enableRegion(10); + R2_GLOBALS._walkRegions.disableRegion(6); + R2_GLOBALS._walkRegions.disableRegion(7); + R2_GLOBALS._walkRegions.disableRegion(9); + R2_GLOBALS._walkRegions.disableRegion(10); R2_INVENTORY.setObjectScene(R2_AEROSOL, 600); R2_GLOBALS.setFlag(5); @@ -5932,9 +5932,9 @@ void Scene600::signal() { // deactivate cloud R2_GLOBALS.setFlag(8); _smoke.remove(); - R2_GLOBALS._walkRegions.disableRegion(6); - R2_GLOBALS._walkRegions.disableRegion(9); - R2_GLOBALS._walkRegions.disableRegion(10); + R2_GLOBALS._walkRegions.enableRegion(6); + R2_GLOBALS._walkRegions.enableRegion(9); + R2_GLOBALS._walkRegions.enableRegion(10); R2_GLOBALS._player.enableControl(); break; case 612: @@ -5951,7 +5951,7 @@ void Scene600::signal() { R2_GLOBALS._player.enableControl(); _aerosol.remove(); R2_INVENTORY.setObjectScene(R2_AEROSOL, 1); - R2_GLOBALS._walkRegions.disableRegion(7); + R2_GLOBALS._walkRegions.enableRegion(7); break; case 615: // Pick up Com Scanner diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index 35b4ba4545..f17310ec7b 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -7877,7 +7877,7 @@ void Scene1550::postInit(SceneObjectList *OwnerList) { _companion.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL); assert(_field419 >= 1550); - R2_GLOBALS._walkRegions.enableRegion(k5A750[_field419 - 1550]); + R2_GLOBALS._walkRegions.disableRegion(k5A750[_field419 - 1550]); setAction(&_sequenceManager1, this, 1590, &_companion, NULL); } else if ((_sceneMode != 1577) && (_sceneMode != 1578)) @@ -7955,7 +7955,7 @@ void Scene1550::signal() { case 42: { _sceneMode = 43; int junkRegionIndex = R2_GLOBALS._scene1550JunkLocations[_junk[0]._junkNumber + 3]; - R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[junkRegionIndex]); + R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[junkRegionIndex]); switch (_junk[0]._frame) { case 1: @@ -9011,10 +9011,10 @@ void Scene1550::enterArea() { _junk[di].setPosition(Common::Point(150, 70)); _junk[di].setup(1562, 1, 1); - R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[2]); - R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[3]); - R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[6]); - R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[7]); + R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[2]); + R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[3]); + R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[6]); + R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[7]); if (R2_INVENTORY.getObjectScene(R2_JOYSTICK) == 1550) { _actor9.postInit(); @@ -9033,7 +9033,7 @@ void Scene1550::enterArea() { } _junk[di].setPosition(Common::Point(k5A72E[tmpIdx], k5A73F[tmpIdx])); if (scene1550JunkRegions[tmpIdx] != 0) - R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[tmpIdx]); + R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[tmpIdx]); di++; } } @@ -9092,7 +9092,7 @@ void Scene1550::enterArea() { _actor4.setPosition(Common::Point(172, 48)); _actor4.fixPriority(169); - R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[15]); + R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[15]); break; case 2: _wreckage.postInit(); @@ -9249,7 +9249,7 @@ void Scene1550::enterArea() { _companion.changeZoom(-1); assert((_field419 >= 1550) && (_field419 <= 2008)); - R2_GLOBALS._walkRegions.enableRegion(k5A750[_field419 - 1550]); + R2_GLOBALS._walkRegions.disableRegion(k5A750[_field419 - 1550]); _companion.setPosition(Common::Point(k5A72E[k5A76D[_field419 - 1550]], k5A73F[k5A76D[_field419 - 1550]] + 8)); if (R2_GLOBALS._player._characterIndex == R2_QUINN) { if (R2_GLOBALS._player._characterScene[R2_SEEKER] == 1580) { @@ -10403,8 +10403,8 @@ void Scene1700::enterArea() { _ledgeHopper.setup(1701, 1, 1); _ledgeHopper.setPosition(Common::Point(220, 137)); _ledgeHopper.setDetails(1700, 6, -1, -1, 2, (SceneItem *) NULL); - R2_GLOBALS._walkRegions.enableRegion(2); - R2_GLOBALS._walkRegions.enableRegion(12); + R2_GLOBALS._walkRegions.disableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(12); } if ((R2_GLOBALS._rimLocation + 2) % 4 == 0) { @@ -10428,7 +10428,7 @@ void Scene1700::enterArea() { _slabEast.setup(1700, 1, 2); _slabEast.setPosition(Common::Point(424, 84)); - R2_GLOBALS._walkRegions.enableRegion(11); + R2_GLOBALS._walkRegions.disableRegion(11); } if ((R2_GLOBALS._rimLocation + 399) % 800 == 0) { @@ -10441,7 +10441,7 @@ void Scene1700::enterArea() { _westExit._enabled = true; } else { - R2_GLOBALS._walkRegions.enableRegion(1); + R2_GLOBALS._walkRegions.disableRegion(1); _westExit._enabled = false; } @@ -10587,11 +10587,11 @@ void Scene1700::postInit(SceneObjectList *OwnerList) { if (R2_GLOBALS._player._characterIndex == R2_QUINN) { R2_GLOBALS._player.setPosition(Common::Point(109, 160)); _actor12.setPosition(Common::Point(156, 160)); - R2_GLOBALS._walkRegions.enableRegion(15); + R2_GLOBALS._walkRegions.disableRegion(15); } else { R2_GLOBALS._player.setPosition(Common::Point(156, 160)); _actor12.setPosition(Common::Point(109, 160)); - R2_GLOBALS._walkRegions.enableRegion(17); + R2_GLOBALS._walkRegions.disableRegion(17); } _sceneMode = 50; setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL); @@ -10630,13 +10630,13 @@ void Scene1700::signal() { Common::Point pt2(156, 160); NpcMover *mover2 = new NpcMover(); _actor12.addMover(mover2, &pt2, NULL); - R2_GLOBALS._walkRegions.enableRegion(15); + R2_GLOBALS._walkRegions.disableRegion(15); } else { _actor12.setPosition(Common::Point(109, 170)); Common::Point pt3(109, 160); NpcMover *mover3 = new NpcMover(); _actor12.addMover(mover3, &pt3, NULL); - R2_GLOBALS._walkRegions.enableRegion(17); + R2_GLOBALS._walkRegions.disableRegion(17); } } break; @@ -10655,13 +10655,13 @@ void Scene1700::signal() { Common::Point pt2(155, 10); NpcMover *mover2 = new NpcMover(); _actor12.addMover(mover2, &pt2, NULL); - R2_GLOBALS._walkRegions.enableRegion(15); + R2_GLOBALS._walkRegions.disableRegion(15); } else { _actor12.setPosition(Common::Point(188, 0)); Common::Point pt3(188, 10); NpcMover *mover3 = new NpcMover(); _actor12.addMover(mover3, &pt3, NULL); - R2_GLOBALS._walkRegions.enableRegion(17); + R2_GLOBALS._walkRegions.disableRegion(17); } } break; @@ -10702,13 +10702,13 @@ void Scene1700::signal() { _actor12.setObjectWrapper(new SceneObjectWrapper()); _actor12._strip = 1; R2_GLOBALS._player.enableControl(CURSOR_WALK); - R2_GLOBALS._walkRegions.enableRegion(14); + R2_GLOBALS._walkRegions.disableRegion(14); break; case 8: R2_GLOBALS._player._strip = 2; _actor12._strip = 1; R2_GLOBALS._player.enableControl(CURSOR_WALK); - R2_GLOBALS._walkRegions.enableRegion(12); + R2_GLOBALS._walkRegions.disableRegion(12); break; case 30: _sceneMode = 31; @@ -10730,17 +10730,17 @@ void Scene1700::signal() { break; case 50: if (R2_GLOBALS._player._characterIndex == R2_QUINN) - R2_GLOBALS._walkRegions.enableRegion(15); + R2_GLOBALS._walkRegions.disableRegion(15); else - R2_GLOBALS._walkRegions.enableRegion(17); + R2_GLOBALS._walkRegions.disableRegion(17); R2_GLOBALS._player.enableControl(); break; case 1704: R2_GLOBALS._sound1.play(134); - R2_GLOBALS._walkRegions.enableRegion(15); - R2_GLOBALS._walkRegions.enableRegion(2); - R2_GLOBALS._walkRegions.enableRegion(12); + R2_GLOBALS._walkRegions.disableRegion(15); + R2_GLOBALS._walkRegions.disableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(12); R2_GLOBALS._player.fixPriority(-1); R2_GLOBALS._player.enableControl(CURSOR_WALK); break; @@ -11390,7 +11390,7 @@ void Scene1800::postInit(SceneObjectList *OwnerList) { R2_GLOBALS._player.setObjectWrapper(NULL); R2_GLOBALS._player.setup(1801, 5, 12); R2_GLOBALS._player.setPosition(Common::Point(160, 139)); - R2_GLOBALS._walkRegions.enableRegion(9); + R2_GLOBALS._walkRegions.disableRegion(9); _doors.hide(); } else { R2_GLOBALS._player.setVisage(1507); @@ -11407,7 +11407,7 @@ void Scene1800::postInit(SceneObjectList *OwnerList) { _companion.setObjectWrapper(NULL); _companion.setup(1801, 5, 12); - R2_GLOBALS._walkRegions.enableRegion(9); + R2_GLOBALS._walkRegions.disableRegion(9); _doors.hide(); } else { _companion.setup(1507, 1, 1); @@ -11427,11 +11427,11 @@ void Scene1800::postInit(SceneObjectList *OwnerList) { R2_GLOBALS._player.setStrip(5); if (R2_GLOBALS.getFlag(14)) { _companion.setPosition(Common::Point(160, 139)); - R2_GLOBALS._walkRegions.enableRegion(8); + R2_GLOBALS._walkRegions.disableRegion(8); } else { _companion.setPosition(Common::Point(209, 150)); _companion.setStrip(6); - R2_GLOBALS._walkRegions.enableRegion(8); + R2_GLOBALS._walkRegions.disableRegion(8); } } else { if (R2_GLOBALS.getFlag(14)) { @@ -11443,8 +11443,8 @@ void Scene1800::postInit(SceneObjectList *OwnerList) { } _companion.setPosition(Common::Point(114, 150)); _companion.setStrip(5); - R2_GLOBALS._walkRegions.enableRegion(10); - R2_GLOBALS._walkRegions.enableRegion(11); + R2_GLOBALS._walkRegions.disableRegion(10); + R2_GLOBALS._walkRegions.disableRegion(11); } } else { if (R2_GLOBALS._player._characterIndex == R2_QUINN) { @@ -11586,7 +11586,7 @@ void Scene1800::signal() { R2_GLOBALS._player.enableControl(CURSOR_USE); break; case 1800: - R2_GLOBALS._walkRegions.enableRegion(8); + R2_GLOBALS._walkRegions.disableRegion(8); if (R2_GLOBALS.getFlag(63)) R2_GLOBALS._player.enableControl(CURSOR_USE); else { @@ -11596,8 +11596,8 @@ void Scene1800::signal() { } break; case 1801: - R2_GLOBALS._walkRegions.enableRegion(10); - R2_GLOBALS._walkRegions.enableRegion(11); + R2_GLOBALS._walkRegions.disableRegion(10); + R2_GLOBALS._walkRegions.disableRegion(11); R2_GLOBALS.setFlag(63); // The following check is completely dumb. @@ -11636,14 +11636,14 @@ void Scene1800::signal() { case 1814: // No break on purpose case 1815: - R2_GLOBALS._walkRegions.enableRegion(10); - R2_GLOBALS._walkRegions.enableRegion(11); + R2_GLOBALS._walkRegions.disableRegion(10); + R2_GLOBALS._walkRegions.disableRegion(11); R2_GLOBALS._player.enableControl(); break; case 1816: // No break on purpose case 1817: - R2_GLOBALS._walkRegions.enableRegion(8); + R2_GLOBALS._walkRegions.disableRegion(8); R2_GLOBALS._player.enableControl(); break; default: @@ -11908,19 +11908,19 @@ void Scene1850::postInit(SceneObjectList *OwnerList) { _rightDoor.setPosition(Common::Point(253, 102)); _rightDoor.setDetails(1850, 22, -1, -1, 1, (SceneItem *) NULL); - R2_GLOBALS._walkRegions.enableRegion(1); + R2_GLOBALS._walkRegions.disableRegion(1); _robot.postInit(); if (R2_GLOBALS.getFlag(34)) { - R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(2); _robot.setup(1851, 4, 3); } else if (R2_GLOBALS.getFlag(30)) { _robot.setup(1851, 2, 2); } else { - R2_GLOBALS._walkRegions.enableRegion(5); + R2_GLOBALS._walkRegions.disableRegion(5); if (R2_GLOBALS.getFlag(33)) { - R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(2); _robot.setup(1851, 1, 3); } else { _robot.setup(1851, 2, 1); @@ -12167,7 +12167,7 @@ void Scene1850::signal() { _companion._effect = 6; _companion._shade = 6; - R2_GLOBALS._walkRegions.enableRegion(5); + R2_GLOBALS._walkRegions.disableRegion(5); if (R2_GLOBALS.getFlag(68)) { R2_GLOBALS._player.enableControl(); @@ -12229,7 +12229,7 @@ void Scene1850::signal() { } else if (R2_GLOBALS.getFlag(33)) { R2_GLOBALS.setFlag(62); R2_GLOBALS.setFlag(34); - R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(2); _actor2.postInit(); _actor2.setDetails(1850, 6, -1, -1, 5, &_robot); @@ -12330,7 +12330,7 @@ void Scene1850::signal() { _field41E = 0; break; case 1870: - R2_GLOBALS._walkRegions.enableRegion(5); + R2_GLOBALS._walkRegions.disableRegion(5); R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 1); R2_GLOBALS.setFlag(32); R2_GLOBALS._player.enableControl(CURSOR_WALK); @@ -12376,7 +12376,7 @@ void Scene1850::signal() { case 1878: R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 1850); R2_GLOBALS.setFlag(33); - R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(2); R2_GLOBALS._player.enableControl(); break; case 1879: @@ -12813,7 +12813,7 @@ void Scene1900::postInit(SceneObjectList *OwnerList) { if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) { _actor1.postInit(); _actor1.setPosition(Common::Point(30, 110)); - R2_GLOBALS._walkRegions.enableRegion(1); + R2_GLOBALS._walkRegions.disableRegion(1); _actor1.setup(2008, 3, 1); _actor1.setDetails(9001, 0, -1, -1, 1, (SceneItem *) NULL); } @@ -12822,7 +12822,7 @@ void Scene1900::postInit(SceneObjectList *OwnerList) { if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) { _actor1.postInit(); _actor1.setPosition(Common::Point(30, 110)); - R2_GLOBALS._walkRegions.enableRegion(1); + R2_GLOBALS._walkRegions.disableRegion(1); if (R2_GLOBALS._player._characterIndex == R2_QUINN) { _actor1.setup(20, 3, 1); _actor1.setDetails(9002, 1, -1, -1, 1, (SceneItem *) NULL); @@ -14349,11 +14349,11 @@ void Scene1950::initExits() { _exit7._enabled = true; if ((R2_INVENTORY.getObjectScene(R2_SCRITH_KEY) == 0) && (R2_INVENTORY.getObjectScene(R2_SAPPHIRE_BLUE) == 1950)) _exit8._enabled = true; - R2_GLOBALS._walkRegions.enableRegion(2); - R2_GLOBALS._walkRegions.enableRegion(3); - R2_GLOBALS._walkRegions.enableRegion(4); - R2_GLOBALS._walkRegions.enableRegion(5); - R2_GLOBALS._walkRegions.enableRegion(6); + R2_GLOBALS._walkRegions.disableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(3); + R2_GLOBALS._walkRegions.disableRegion(4); + R2_GLOBALS._walkRegions.disableRegion(5); + R2_GLOBALS._walkRegions.disableRegion(6); break; case 1: // No break on purpose @@ -14471,8 +14471,8 @@ void Scene1950::initExits() { // No break on purpose case 104: _exit6._enabled = true; - R2_GLOBALS._walkRegions.enableRegion(6); - R2_GLOBALS._walkRegions.enableRegion(9); + R2_GLOBALS._walkRegions.disableRegion(6); + R2_GLOBALS._walkRegions.disableRegion(9); break; case 5: // No break on purpose @@ -14522,16 +14522,16 @@ void Scene1950::initExits() { // No break on purpose case 101: _exit3._enabled = true; - R2_GLOBALS._walkRegions.enableRegion(1); - R2_GLOBALS._walkRegions.enableRegion(7); - R2_GLOBALS._walkRegions.enableRegion(13); + R2_GLOBALS._walkRegions.disableRegion(1); + R2_GLOBALS._walkRegions.disableRegion(7); + R2_GLOBALS._walkRegions.disableRegion(13); break; default: - R2_GLOBALS._walkRegions.enableRegion(1); - R2_GLOBALS._walkRegions.enableRegion(6); - R2_GLOBALS._walkRegions.enableRegion(7); - R2_GLOBALS._walkRegions.enableRegion(9); - R2_GLOBALS._walkRegions.enableRegion(13); + R2_GLOBALS._walkRegions.disableRegion(1); + R2_GLOBALS._walkRegions.disableRegion(6); + R2_GLOBALS._walkRegions.disableRegion(7); + R2_GLOBALS._walkRegions.disableRegion(9); + R2_GLOBALS._walkRegions.disableRegion(13); break; } @@ -14586,8 +14586,8 @@ void Scene1950::initExits() { _actor1.setFrame(2); _actor1.setPosition(Common::Point(160, 167)); _actor1.fixPriority(220); - R2_GLOBALS._walkRegions.enableRegion(3); - R2_GLOBALS._walkRegions.enableRegion(4); + R2_GLOBALS._walkRegions.disableRegion(3); + R2_GLOBALS._walkRegions.disableRegion(4); break; case 7: // No break on purpose @@ -14650,8 +14650,8 @@ void Scene1950::initExits() { _actor1.setFrame(3); _actor1.setPosition(Common::Point(160, 167)); _actor1.fixPriority(220); - R2_GLOBALS._walkRegions.enableRegion(3); - R2_GLOBALS._walkRegions.enableRegion(4); + R2_GLOBALS._walkRegions.disableRegion(3); + R2_GLOBALS._walkRegions.disableRegion(4); break; default: _actor1.postInit(); @@ -14761,11 +14761,11 @@ void Scene1950::initExits() { // No break on purpose case 100: _exit4._enabled = true; - R2_GLOBALS._walkRegions.enableRegion(4); - R2_GLOBALS._walkRegions.enableRegion(5); - R2_GLOBALS._walkRegions.enableRegion(6); - R2_GLOBALS._walkRegions.enableRegion(10); - R2_GLOBALS._walkRegions.enableRegion(11); + R2_GLOBALS._walkRegions.disableRegion(4); + R2_GLOBALS._walkRegions.disableRegion(5); + R2_GLOBALS._walkRegions.disableRegion(6); + R2_GLOBALS._walkRegions.disableRegion(10); + R2_GLOBALS._walkRegions.disableRegion(11); default: break; } @@ -14876,10 +14876,10 @@ void Scene1950::enterArea() { if (R2_GLOBALS._v566A4 == 102) { R2_GLOBALS._walkRegions.load(1951); - R2_GLOBALS._walkRegions.enableRegion(1); - R2_GLOBALS._walkRegions.enableRegion(5); - R2_GLOBALS._walkRegions.enableRegion(6); - R2_GLOBALS._walkRegions.enableRegion(7); + R2_GLOBALS._walkRegions.disableRegion(1); + R2_GLOBALS._walkRegions.disableRegion(5); + R2_GLOBALS._walkRegions.disableRegion(6); + R2_GLOBALS._walkRegions.disableRegion(7); _actor6.postInit(); _actor6.setVisage(1970); diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp index 9fa64b3ec1..01c5ae3fd6 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp @@ -1575,7 +1575,7 @@ void Scene2430::postInit(SceneObjectList *OwnerList) { _actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); } _actor1.setPosition(Common::Point(189, 137)); - R2_GLOBALS._walkRegions.enableRegion(4); + R2_GLOBALS._walkRegions.disableRegion(4); } _item2.setDetails(Rect(11, 30, 37, 45), 2430, 3, -1, 5, 1, NULL); @@ -1720,7 +1720,7 @@ void Scene2435::postInit(SceneObjectList *OwnerList) { _companion.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); } _companion.setPosition(Common::Point(107, 145)); - R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(2); } _leftWindow.setDetails(Rect(52, 44, 96, 82), 2430, 3, -1, 5, 1, NULL); @@ -1778,7 +1778,7 @@ void Scene2435::signal() { setAction(&_sequenceManager, this, 2436, &_companion, NULL); break; case 2436: - R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(2); _sceneMode = 20; R2_GLOBALS._events.setCursor(CURSOR_ARROW); _stripManager.start(709, this); @@ -2587,7 +2587,7 @@ void Scene2525::postInit(SceneObjectList *OwnerList) { } _actor1.setPosition(Common::Point(209, 162)); - R2_GLOBALS._walkRegions.enableRegion(4); + R2_GLOBALS._walkRegions.disableRegion(4); } _item5.setDetails(Rect(125, 73, 140, 86), 2525, 6, -1, -1, 1, NULL); @@ -2748,7 +2748,7 @@ void Scene2530::postInit(SceneObjectList *OwnerList) { _actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); } _actor1.setPosition(Common::Point(20, 130)); - R2_GLOBALS._walkRegions.enableRegion(1); + R2_GLOBALS._walkRegions.disableRegion(1); } _item2.setDetails(Rect(108, 90, 135, 205), 2530, 22, -1, -1, 1, NULL); @@ -2872,7 +2872,7 @@ void Scene2535::postInit(SceneObjectList *OwnerList) { _rebreatherTank.setup(2535, 3, 1); _rebreatherTank.setPosition(Common::Point(203, 131)); _rebreatherTank.setDetails(3, 20, -1, -1, 1, (SceneItem *)NULL); - R2_GLOBALS._walkRegions.enableRegion(6); + R2_GLOBALS._walkRegions.disableRegion(6); } if ((R2_INVENTORY.getObjectScene(R2_REBREATHER_TANK) == 0) && (R2_GLOBALS.getFlag(73))) { @@ -2911,7 +2911,7 @@ void Scene2535::postInit(SceneObjectList *OwnerList) { _companion.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); } _companion.setPosition(Common::Point(245, 115)); - R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(2); } _roof.setDetails(Rect(96, 3, 215, 33), 2535, 3, 6, 5, 1, NULL); @@ -2947,7 +2947,7 @@ void Scene2535::signal() { break; case 2536: R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 0); - R2_GLOBALS._walkRegions.disableRegion(6); + R2_GLOBALS._walkRegions.enableRegion(6); if (!R2_GLOBALS.getFlag(73)) { _rebreatherTank.remove(); R2_GLOBALS._player.enableControl(); diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index 233e83effd..3b83e96b7b 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -588,10 +588,10 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { _actor4.postInit(); if (R2_GLOBALS.getFlag(75)) { if (R2_GLOBALS.getFlag(76)) { - R2_GLOBALS._walkRegions.enableRegion(1); - R2_GLOBALS._walkRegions.enableRegion(4); - R2_GLOBALS._walkRegions.enableRegion(5); - R2_GLOBALS._walkRegions.enableRegion(6); + R2_GLOBALS._walkRegions.disableRegion(1); + R2_GLOBALS._walkRegions.disableRegion(4); + R2_GLOBALS._walkRegions.disableRegion(5); + R2_GLOBALS._walkRegions.disableRegion(6); _actor4.setup(3152, 4, 10); _actor4.setDetails(3150, 14, -1, -1, 1, (SceneItem *)NULL); } else { @@ -765,10 +765,10 @@ void Scene3150::signal() { R2_GLOBALS._sceneItems.remove(&_actor2); _exit1.setDetails(Rect(0, 135, 60, 168), EXITCURSOR_SW, 3275); _exit1.setDest(Common::Point(70, 125)); - R2_GLOBALS._walkRegions.enableRegion(1); - R2_GLOBALS._walkRegions.enableRegion(4); - R2_GLOBALS._walkRegions.enableRegion(5); - R2_GLOBALS._walkRegions.enableRegion(6); + R2_GLOBALS._walkRegions.disableRegion(1); + R2_GLOBALS._walkRegions.disableRegion(4); + R2_GLOBALS._walkRegions.disableRegion(5); + R2_GLOBALS._walkRegions.disableRegion(6); R2_GLOBALS.setFlag(78); R2_GLOBALS._player.enableControl(); break; @@ -1844,16 +1844,16 @@ bool Scene3375::Actor4::startAction(CursorType action, Event &event) { return SceneActor::startAction(action, event); if (R2_GLOBALS._v56A9E != 0) { - R2_GLOBALS._walkRegions.disableRegion(2); - R2_GLOBALS._walkRegions.disableRegion(3); + R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.enableRegion(3); } else { - R2_GLOBALS._walkRegions.disableRegion(1); - R2_GLOBALS._walkRegions.disableRegion(3); - R2_GLOBALS._walkRegions.disableRegion(4); + R2_GLOBALS._walkRegions.enableRegion(1); + R2_GLOBALS._walkRegions.enableRegion(3); + R2_GLOBALS._walkRegions.enableRegion(4); } - R2_GLOBALS._walkRegions.disableRegion(6); - R2_GLOBALS._walkRegions.disableRegion(7); - R2_GLOBALS._walkRegions.disableRegion(8); + R2_GLOBALS._walkRegions.enableRegion(6); + R2_GLOBALS._walkRegions.enableRegion(7); + R2_GLOBALS._walkRegions.enableRegion(8); R2_GLOBALS._player.disableControl(CURSOR_ARROW); @@ -1870,12 +1870,12 @@ void Scene3375::Exit1::changeScene() { R2_GLOBALS._player.disableControl(CURSOR_ARROW); scene->_sceneMode = 3376; if (R2_GLOBALS._v56A9E != 0) { - R2_GLOBALS._walkRegions.disableRegion(2); - R2_GLOBALS._walkRegions.disableRegion(3); + R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.enableRegion(3); } else { - R2_GLOBALS._walkRegions.disableRegion(1); - R2_GLOBALS._walkRegions.disableRegion(3); - R2_GLOBALS._walkRegions.disableRegion(4); + R2_GLOBALS._walkRegions.enableRegion(1); + R2_GLOBALS._walkRegions.enableRegion(3); + R2_GLOBALS._walkRegions.enableRegion(4); } if (scene->_actor1._position.y != 163) { R2_GLOBALS._player.setStrip(-1); @@ -1908,12 +1908,12 @@ void Scene3375::Exit2::changeScene() { scene->_field1488 = 3381; if (R2_GLOBALS._v56A9E != 0) { - R2_GLOBALS._walkRegions.disableRegion(2); - R2_GLOBALS._walkRegions.disableRegion(3); + R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.enableRegion(3); } else { - R2_GLOBALS._walkRegions.disableRegion(1); - R2_GLOBALS._walkRegions.disableRegion(3); - R2_GLOBALS._walkRegions.disableRegion(4); + R2_GLOBALS._walkRegions.enableRegion(1); + R2_GLOBALS._walkRegions.enableRegion(3); + R2_GLOBALS._walkRegions.enableRegion(4); } scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, NULL); } @@ -1930,12 +1930,12 @@ void Scene3375::Exit3::changeScene() { scene->_field1488 = 3380; if (R2_GLOBALS._v56A9E != 0) { - R2_GLOBALS._walkRegions.disableRegion(2); - R2_GLOBALS._walkRegions.disableRegion(3); + R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.enableRegion(3); } else { - R2_GLOBALS._walkRegions.disableRegion(1); - R2_GLOBALS._walkRegions.disableRegion(3); - R2_GLOBALS._walkRegions.disableRegion(4); + R2_GLOBALS._walkRegions.enableRegion(1); + R2_GLOBALS._walkRegions.enableRegion(3); + R2_GLOBALS._walkRegions.enableRegion(4); } scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, NULL); } @@ -2091,28 +2091,28 @@ void Scene3375::signalCase3379() { case 0: _exit1._enabled = true; if (R2_GLOBALS._sceneManager._previousScene == 3385) - R2_GLOBALS._walkRegions.enableRegion(1); + R2_GLOBALS._walkRegions.disableRegion(1); else { - R2_GLOBALS._walkRegions.enableRegion(3); - R2_GLOBALS._walkRegions.enableRegion(4); + R2_GLOBALS._walkRegions.disableRegion(3); + R2_GLOBALS._walkRegions.disableRegion(4); } - R2_GLOBALS._walkRegions.enableRegion(6); - R2_GLOBALS._walkRegions.enableRegion(7); + R2_GLOBALS._walkRegions.disableRegion(6); + R2_GLOBALS._walkRegions.disableRegion(7); case 2: _exit1._enabled = false; - R2_GLOBALS._walkRegions.enableRegion(2); - R2_GLOBALS._walkRegions.enableRegion(3); - R2_GLOBALS._walkRegions.enableRegion(5); - R2_GLOBALS._walkRegions.enableRegion(6); - R2_GLOBALS._walkRegions.enableRegion(7); - R2_GLOBALS._walkRegions.enableRegion(8); - R2_GLOBALS._walkRegions.enableRegion(9); + R2_GLOBALS._walkRegions.disableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(3); + R2_GLOBALS._walkRegions.disableRegion(5); + R2_GLOBALS._walkRegions.disableRegion(6); + R2_GLOBALS._walkRegions.disableRegion(7); + R2_GLOBALS._walkRegions.disableRegion(8); + R2_GLOBALS._walkRegions.disableRegion(9); default: _exit1._enabled = false; - R2_GLOBALS._walkRegions.enableRegion(2); - R2_GLOBALS._walkRegions.enableRegion(3); - R2_GLOBALS._walkRegions.enableRegion(5); - R2_GLOBALS._walkRegions.enableRegion(6); + R2_GLOBALS._walkRegions.disableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(3); + R2_GLOBALS._walkRegions.disableRegion(5); + R2_GLOBALS._walkRegions.disableRegion(6); break; } R2_GLOBALS._sceneManager._previousScene = 3375; @@ -2602,7 +2602,7 @@ void Scene3395::postInit(SceneObjectList *OwnerList) { _actor3.setPosition(Common::Point(155, 242)); _actor4.setup(3395, 1, 1); - R2_GLOBALS._walkRegions.enableRegion(1); + R2_GLOBALS._walkRegions.disableRegion(1); _sceneMode = 3395; setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL); @@ -4283,8 +4283,8 @@ bool Scene3600::Item5::startAction(CursorType action, Event &event) { if ((action != CURSOR_USE) || (scene->_action1._field1E == 0)) return SceneItem::startAction(action, event); - R2_GLOBALS._walkRegions.disableRegion(2); - R2_GLOBALS._walkRegions.disableRegion(7); + R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.enableRegion(7); R2_GLOBALS._player.disableControl(); scene->_sceneMode = 3624; @@ -4439,11 +4439,11 @@ void Scene3600::postInit(SceneObjectList *OwnerList) { _field254A = 1; _field2548 = 1; - R2_GLOBALS._walkRegions.enableRegion(2); - R2_GLOBALS._walkRegions.enableRegion(7); - R2_GLOBALS._walkRegions.enableRegion(14); - R2_GLOBALS._walkRegions.enableRegion(15); - R2_GLOBALS._walkRegions.enableRegion(16); + R2_GLOBALS._walkRegions.disableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(7); + R2_GLOBALS._walkRegions.disableRegion(14); + R2_GLOBALS._walkRegions.disableRegion(15); + R2_GLOBALS._walkRegions.disableRegion(16); _actor10.setup(10, 5, 11); _actor10.animate(ANIM_MODE_1, NULL); @@ -4517,8 +4517,8 @@ void Scene3600::postInit(SceneObjectList *OwnerList) { _field254A = 0; _field2548 = 0; - R2_GLOBALS._walkRegions.enableRegion(17); - R2_GLOBALS._walkRegions.enableRegion(18); + R2_GLOBALS._walkRegions.disableRegion(17); + R2_GLOBALS._walkRegions.disableRegion(18); _actor10.setPosition(Common::Point(393, 148)); _actor11.setPosition(Common::Point(364, 153)); @@ -4568,7 +4568,7 @@ void Scene3600::signal() { switch (_sceneMode) { case 3320: warning("STUB: sub_1D227()"); - R2_GLOBALS._walkRegions.enableRegion(14); + R2_GLOBALS._walkRegions.disableRegion(14); R2_GLOBALS._scrollFollower = &_actor11; _tealSpeaker._object1.hide(); _actor5.show(); @@ -4617,13 +4617,13 @@ void Scene3600::signal() { _quinnSpeaker._displayMode = 1; _actor13.show(); R2_GLOBALS._scrollFollower = &R2_GLOBALS._player; - R2_GLOBALS._walkRegions.disableRegion(17); - R2_GLOBALS._walkRegions.disableRegion(18); - R2_GLOBALS._walkRegions.enableRegion(2); - R2_GLOBALS._walkRegions.enableRegion(7); - R2_GLOBALS._walkRegions.enableRegion(14); - R2_GLOBALS._walkRegions.enableRegion(15); - R2_GLOBALS._walkRegions.enableRegion(16); + R2_GLOBALS._walkRegions.enableRegion(17); + R2_GLOBALS._walkRegions.enableRegion(18); + R2_GLOBALS._walkRegions.disableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(7); + R2_GLOBALS._walkRegions.disableRegion(14); + R2_GLOBALS._walkRegions.disableRegion(15); + R2_GLOBALS._walkRegions.disableRegion(16); _actor13.setAction(&_action1); } break; @@ -4713,8 +4713,8 @@ void Scene3600::signal() { case 3602: // No break on purpose case 3603: - R2_GLOBALS._walkRegions.enableRegion(2); - R2_GLOBALS._walkRegions.enableRegion(7); + R2_GLOBALS._walkRegions.disableRegion(2); + R2_GLOBALS._walkRegions.disableRegion(7); R2_GLOBALS._v558B6.set(60, 0, 260, 200); _tealSpeaker._displayMode = 1; _sceneMode = 3321; @@ -4723,8 +4723,8 @@ void Scene3600::signal() { case 3604: R2_GLOBALS._sound2.fadeOut2(NULL); R2_GLOBALS._sound1.stop(); - R2_GLOBALS._walkRegions.disableRegion(2); - R2_GLOBALS._walkRegions.disableRegion(7); + R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.enableRegion(7); _actor2.hide(); _actor3.hide(); @@ -4826,8 +4826,8 @@ void Scene3600::dispatch() { _field254C = 0; _field254E = 1; - R2_GLOBALS._walkRegions.disableRegion(2); - R2_GLOBALS._walkRegions.disableRegion(7); + R2_GLOBALS._walkRegions.enableRegion(2); + R2_GLOBALS._walkRegions.enableRegion(7); R2_GLOBALS._player.disableControl(); _sceneMode = 3624; |