diff options
| author | Paul Gilbert | 2013-11-08 20:54:36 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2013-11-08 20:54:36 -0500 |
| commit | 2ae273ef439ad34bc761034c3e80ea41c9497a2a (patch) | |
| tree | a30170d2dd76667797abb957e771679a0f244fe4 /engines/tsage | |
| parent | 3ec2ad3e6391980bd0f85c7ff7ce0518168c271e (diff) | |
| download | scummvm-rg350-2ae273ef439ad34bc761034c3e80ea41c9497a2a.tar.gz scummvm-rg350-2ae273ef439ad34bc761034c3e80ea41c9497a2a.tar.bz2 scummvm-rg350-2ae273ef439ad34bc761034c3e80ea41c9497a2a.zip | |
TSAGE: Converted R2R scene 700 globals to constants
Diffstat (limited to 'engines/tsage')
| -rw-r--r-- | engines/tsage/globals.cpp | 6 | ||||
| -rw-r--r-- | engines/tsage/globals.h | 2 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 11 |
3 files changed, 7 insertions, 12 deletions
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp index caad2ba88f..3151cddb91 100644 --- a/engines/tsage/globals.cpp +++ b/engines/tsage/globals.cpp @@ -445,8 +445,6 @@ Ringworld2Globals::Ringworld2Globals() { _electromagnetZoom = 0; _v565E5 = 0; _v565E7 = 0; - _v565E9 = -5; - _v565EB = 26; _foodCount = 0; _rimLocation = 0; _rimTransportLocation = 0; @@ -483,8 +481,6 @@ void Ringworld2Globals::reset() { _electromagnetZoom = 0; _v565E5 = 0; _v565E7 = 0; - _v565E9 = -5; - _v565EB = 26; _foodCount = 0; _rimLocation = 0; _rimTransportLocation = 0; @@ -589,8 +585,6 @@ void Ringworld2Globals::synchronize(Serializer &s) { s.syncAsSint16LE(_electromagnetZoom); s.syncAsSint16LE(_v565E5); s.syncAsSint16LE(_v565E7); - s.syncAsSint16LE(_v565E9); - s.syncAsSint16LE(_v565EB); s.syncAsSint16LE(_foodCount); s.syncAsSint32LE(_rimLocation); s.syncAsSint16LE(_rimTransportLocation); diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index c5dc308efd..bea3d8614e 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -257,8 +257,6 @@ public: int _electromagnetZoom; int _v565E5; int _v565E7; - int _v565E9; - int _v565EB; // CHECKME: IS it a constant? int _foodCount; int _rimLocation; int _rimTransportLocation; diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index c68ab265e5..34949b0a83 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -6127,6 +6127,9 @@ void Scene600::dispatch() { * *--------------------------------------------------------------------------*/ +#define CABLE700_X 26 +#define CABLE700_Y -5 + Scene700::Scene700() { _rotation = NULL; } @@ -6350,7 +6353,7 @@ void Scene700::postInit(SceneObjectList *OwnerList) { break; case 700: _cable.setup(701, 3, 1); - _cable.setPosition(Common::Point(356 - (R2_GLOBALS._v565EB * 8), 148 - (((R2_GLOBALS._v565E9 + 10) / 5) * 4))); + _cable.setPosition(Common::Point(356 - (CABLE700_X * 8), 148 - (((CABLE700_Y + 10) / 5) * 4))); _cable.setDetails(700, 37, -1, -1, 1, (SceneItem *) NULL); break; default: @@ -6371,7 +6374,7 @@ void Scene700::postInit(SceneObjectList *OwnerList) { case 700: _cable.setup(701, 1, 8); if (R2_GLOBALS._v565E7 == 0) { - _cable.setPosition(Common::Point(356 - (R2_GLOBALS._v565EB * 8), 148 - (((R2_GLOBALS._v565E9 + 10) / 5) * 4))); + _cable.setPosition(Common::Point(356 - (CABLE700_X * 8), 148 - (((CABLE700_Y + 10) / 5) * 4))); } else { _cable.setup(701, 1, 1); _cable.setPosition(Common::Point(_electromagnet._position.x + 1, _electromagnet._position.y + 120)); @@ -7634,8 +7637,8 @@ void Scene900::postInit(SceneObjectList *OwnerList) { if (R2_GLOBALS._v565E7 == 0) { _cable.setup(901, 1, 8); // Original set two times the same values: skipped - _cable.setPosition(Common::Point((((100 - ((R2_GLOBALS._v565EB * 350) / 100)) * 49) / 100) + ((R2_GLOBALS._v565E9 * _electromagnet._percent * 6) / 100) + 89, 166 - (R2_GLOBALS._v565EB / 3))); - _cable.changeZoom(((100 - ((R2_GLOBALS._v565EB * 350) / 100) + 52) / 10) * 10); + _cable.setPosition(Common::Point((((100 - ((CABLE700_X * 350) / 100)) * 49) / 100) + ((CABLE700_Y * _electromagnet._percent * 6) / 100) + 89, 166 - (CABLE700_X / 3))); + _cable.changeZoom(((100 - ((CABLE700_X * 350) / 100) + 52) / 10) * 10); } } } |