diff options
| author | Paul Gilbert | 2013-11-08 20:17:53 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2013-11-08 20:17:53 -0500 |
| commit | 5526a11caf8c18644dc6444c7b9f1587f6464c3f (patch) | |
| tree | 9e61d07a3cae40241c06271cdbd2768ac3269367 /engines | |
| parent | 732890232e857753bff34c3216c2e84af2e101a1 (diff) | |
| download | scummvm-rg350-5526a11caf8c18644dc6444c7b9f1587f6464c3f.tar.gz scummvm-rg350-5526a11caf8c18644dc6444c7b9f1587f6464c3f.tar.bz2 scummvm-rg350-5526a11caf8c18644dc6444c7b9f1587f6464c3f.zip | |
TSAGE: Rename remaining static arrays used in R2R scene 1550
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.cpp | 4 | ||||
| -rw-r--r-- | engines/tsage/staticres.cpp | 4 | ||||
| -rw-r--r-- | engines/tsage/staticres.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index f0d2b298b7..c851c57889 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -9004,7 +9004,7 @@ void Scene1550::enterArea() { _junk[di].changeZoom(-1); _junk[di].setup(1552, ((R2_GLOBALS._scene1550JunkLocations[i + 2] - 1) / 5) + 1, ((R2_GLOBALS._scene1550JunkLocations[i + 2] - 1) % 5) + 1); } - _junk[di].setPosition(Common::Point(k5A72E[tmpIdx], k5A73F[tmpIdx])); + _junk[di].setPosition(Common::Point(scene1550JunkX[tmpIdx], scene1550JunkY[tmpIdx])); if (scene1550JunkRegions[tmpIdx] != 0) R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[tmpIdx]); di++; @@ -9224,7 +9224,7 @@ void Scene1550::enterArea() { assert((_walkRegionsId >= 1550) && (_walkRegionsId <= 2008)); R2_GLOBALS._walkRegions.disableRegion(k5A750[_walkRegionsId - 1550]); - _companion.setPosition(Common::Point(k5A72E[k5A76D[_walkRegionsId - 1550]], k5A73F[k5A76D[_walkRegionsId - 1550]] + 8)); + _companion.setPosition(Common::Point(scene1550JunkX[k5A76D[_walkRegionsId - 1550]], scene1550JunkY[k5A76D[_walkRegionsId - 1550]] + 8)); if (R2_GLOBALS._player._characterIndex == R2_QUINN) { if (R2_GLOBALS._player._characterScene[R2_SEEKER] == 1580) { _companion.setup(1516, 3, 17); diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp index 09624225a0..2749f2ac90 100644 --- a/engines/tsage/staticres.cpp +++ b/engines/tsage/staticres.cpp @@ -398,8 +398,8 @@ const byte scene1550AreaMap[] = { 13, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14 }; -const byte k5A72E[] = {0, 98, 135, 183, 229, 81, 133, 185, 235, 75, 131, 187, 241, 70, 129, 190, 247}; -const byte k5A73F[] = {0, 42, 42, 42, 42, 67, 67, 67, 67, 92, 92, 92, 92, 116, 116, 116, 116}; +const byte scene1550JunkX[] = {0, 98, 135, 183, 229, 81, 133, 185, 235, 75, 131, 187, 241, 70, 129, 190, 247}; +const byte scene1550JunkY[] = {0, 42, 42, 42, 42, 67, 67, 67, 67, 92, 92, 92, 92, 116, 116, 116, 116}; const byte k5A750[] = { 9, 10, 7, 13, 7, 8, 9, 7, 9, 10, 2, 3, 3, 2, 2, 2, 4, 3, 3, 4, diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h index 73f8f88904..587463a918 100644 --- a/engines/tsage/staticres.h +++ b/engines/tsage/staticres.h @@ -202,8 +202,8 @@ extern char const *const WRONG_ANSWER_MSG; // Scene 1550 arrays of constants extern const byte scene1550JunkLocationsDefault[]; extern const byte scene1550AreaMap[]; -extern const byte k5A72E[]; -extern const byte k5A73F[]; +extern const byte scene1550JunkX[]; +extern const byte scene1550JunkY[]; extern const byte k5A750[]; extern const byte k5A76D[]; extern const byte scene1550JunkRegions[]; |