libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 09:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TSAGE: Converted R2R scene 700 globals to constants

Browse Source
This commit is contained in:
Paul Gilbert 2013-11-08 20:54:36 -05:00
parent 3ec2ad3e63
commit 2ae273ef43
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/tsage/globals.cpp
View File

@ -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);

2
engines/tsage/globals.h
View File

@ -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;

11
engines/tsage/ringworld2/ringworld2_scenes0.cpp
View File

@ -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);
}
}
}