diff options
| -rw-r--r-- | engines/tsage/blue_force/blueforce_scenes0.cpp | 2 | ||||
| -rw-r--r-- | engines/tsage/globals.cpp | 7 | ||||
| -rw-r--r-- | engines/tsage/globals.h | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp index 28a5f05193..ac8fe46096 100644 --- a/engines/tsage/blue_force/blueforce_scenes0.cpp +++ b/engines/tsage/blue_force/blueforce_scenes0.cpp @@ -423,7 +423,7 @@ void Scene50::remove() { BF_GLOBALS._screenSurface.fillRect(BF_GLOBALS._screenSurface.getBounds(), 0); SceneExt::remove(); - BF_GLOBALS._v4E238 = 1; + BF_GLOBALS._uiElements._active = true; } void Scene50::signal() { diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp index 185c3413f2..6f0223f6db 100644 --- a/engines/tsage/globals.cpp +++ b/engines/tsage/globals.cpp @@ -194,8 +194,6 @@ void BlueForceGlobals::synchronize(Serializer &s) { s.syncAsSint16LE(_deathReason); s.syncAsSint16LE(_driveFromScene); s.syncAsSint16LE(_driveToScene); - s.syncAsSint16LE(_v4CF9E); - s.syncAsSint16LE(_v4E238); s.syncAsSint16LE(_v501FC); s.syncAsSint16LE(_v50696); s.syncAsSint16LE(_v5098C); @@ -207,7 +205,7 @@ void BlueForceGlobals::synchronize(Serializer &s) { s.syncAsSint16LE(_mapLocationId); s.syncAsSint16LE(_clip1Bullets); s.syncAsSint16LE(_clip2Bullets); - + s.syncAsSint16LE(_v4CEB4); } void BlueForceGlobals::reset() { @@ -230,8 +228,6 @@ void BlueForceGlobals::reset() { _dayNumber = 0; _v4CEA4 = 0; _deathReason = 0; - _v4CF9E = 0; - _v4E238 = 0; _v501FC = 0; _v50696 = 0; _v5098C = 0; @@ -240,6 +236,7 @@ void BlueForceGlobals::reset() { _v51C44 = 1; _clip1Bullets = 8; _clip2Bullets = 8; + _v4CEB4 = 0; } bool BlueForceGlobals::getHasBullets() { diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 651a0c8893..ac3b313ca6 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -169,11 +169,10 @@ public: StripProxy _stripProxy; int _dayNumber; int _v4CEA4; + int _v4CEB4; int _deathReason; int _driveFromScene; int _driveToScene; - int _v4CF9E; - int _v4E238; int _v501FC; int _v50696; uint8 _v5098C; |