diff options
author | Strangerke | 2013-11-02 02:25:06 +0100 |
---|---|---|
committer | Strangerke | 2013-11-02 02:25:06 +0100 |
commit | a5895ace86bf38a37dfe8145e8d57bbf01676fad (patch) | |
tree | bc474299a68cc70de933e7587353e39f9cb243b3 /engines | |
parent | e7b71ed50d1f9aeefc9a9b2d1ac743309401a59a (diff) | |
download | scummvm-rg350-a5895ace86bf38a37dfe8145e8d57bbf01676fad.tar.gz scummvm-rg350-a5895ace86bf38a37dfe8145e8d57bbf01676fad.tar.bz2 scummvm-rg350-a5895ace86bf38a37dfe8145e8d57bbf01676fad.zip |
TSAGE: Remove 2 useless variables from scene 180, rename a variable. This breaks the savegames
Diffstat (limited to 'engines')
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 39 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.h | 4 |
2 files changed, 19 insertions, 24 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index 51c2bd3a70..b5173bbf59 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -1508,11 +1508,9 @@ void Scene180::Action1::signal() { /*--------------------------------------------------------------------------*/ Scene180::Scene180(): SceneExt() { - _field412 = 0; + _helpDisabled = 0; _frameInc = 0; _frameNumber = R2_GLOBALS._events.getFrameNumber(); - _field480 = 1; - _field482 = -1; _fontNumber = R2_GLOBALS.gfxManager()._font._fontNumber; GfxFont font; @@ -1557,9 +1555,7 @@ void Scene180::synchronize(Serializer &s) { SceneExt::synchronize(s); s.syncAsSint16LE(_frameNumber); - s.syncAsSint16LE(_field412); - s.syncAsSint16LE(_field480); - s.syncAsSint16LE(_field482); + s.syncAsSint16LE(_helpDisabled); s.syncAsSint16LE(_frameInc); s.syncAsSint16LE(_fontNumber); s.syncAsSint16LE(_fontHeight); @@ -1574,7 +1570,7 @@ void Scene180::signal() { break; case 1: - _field412 = 1; + _helpDisabled = 1; R2_GLOBALS._sceneManager._hasPalette = true; _animationPlayer._paletteMode = ANIMPALMODE_NONE; _animationPlayer._isActive = true; @@ -1612,7 +1608,7 @@ void Scene180::signal() { case 30: case 43: case 47: - _field412 = 0; + _helpDisabled = 0; R2_GLOBALS._screenSurface.fillRect(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 0); _palette.loadPalette(0); _palette.loadPalette(9998); @@ -1626,7 +1622,7 @@ void Scene180::signal() { R2_GLOBALS._scene180Mode = 2; _animationPlayer.load(2); - _field412 = 1; + _helpDisabled = 1; R2_GLOBALS._scenePalette.addFader(_animationPlayer._subData._palData, 256, 6, NULL); R2_GLOBALS._sound1.play(2); break; @@ -1663,7 +1659,7 @@ void Scene180::signal() { break; case 11: - _field412 = 1; + _helpDisabled = 1; _door.postInit(); _shipDisplay.postInit(); setAction(&_sequenceManager, this, 4000, &_door, &_shipDisplay, NULL); @@ -1710,21 +1706,21 @@ void Scene180::signal() { break; case 27: - _field412 = 0; + _helpDisabled = 0; _door.remove(); _shipDisplay.remove(); setSceneDelay(2); break; case 28: - _field412 = 0; + _helpDisabled = 0; _palette.loadPalette(0); _palette.loadPalette(9998); R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 100, this); break; case 29: - _field412 = 1; + _helpDisabled = 1; _animationPlayer._paletteMode = ANIMPALMODE_REPLACE_PALETTE; _animationPlayer._isActive = true; _animationPlayer._objectMode = ANIMOBJMODE_42; @@ -1753,7 +1749,7 @@ void Scene180::signal() { break; case 32: - _field412 = 1; + _helpDisabled = 1; _teal.postInit(); _teal.setPosition(Common::Point(161, 97)); @@ -1803,7 +1799,7 @@ void Scene180::signal() { break; case 37: - _field412 = 0; + _helpDisabled = 0; _dutyOfficer.remove(); _palette.loadPalette(9998); R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 8, this); @@ -1843,7 +1839,7 @@ void Scene180::signal() { break; case 41: - _field412 = 1; + _helpDisabled = 1; _animationPlayer._isActive = true; break; @@ -1863,12 +1859,12 @@ void Scene180::signal() { break; case 45: - _field412 = 1; + _helpDisabled = 1; _stripManager.start(28, this); break; case 48: - _field412 = 1; + _helpDisabled = 1; _animationPlayer._paletteMode = ANIMPALMODE_NONE; _animationPlayer._isActive = true; _animationPlayer._objectMode = ANIMOBJMODE_1; @@ -1891,7 +1887,7 @@ void Scene180::signal() { case 50: R2_GLOBALS._scene180Mode = 0; - _field412 = 0; + _helpDisabled = 0; // WORKAROUND: The original changed to scene 100 here, Quinn's Bedroom, // but instead we're changing to the previously unused scene 50, which shows @@ -1909,10 +1905,9 @@ void Scene180::setSceneDelay(int v) { void Scene180::process(Event &event) { if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_ESCAPE)) { event.handled = 1; - if (!_field412) { - if (R2_GLOBALS._scenePalette._listeners.size() == 0) { + if (!_helpDisabled) { + if (R2_GLOBALS._scenePalette._listeners.size() == 0) HelpDialog::show(); - } } } diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h index 91f3b29b63..00c2bb3961 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.h +++ b/engines/tsage/ringworld2/ringworld2_scenes0.h @@ -210,8 +210,8 @@ public: ASoundExt _sound1; int _frameNumber; - int _field412, _field480; - int _field482, _frameInc; + int _helpDisabled; + int _frameInc; int _fontNumber, _fontHeight; public: Scene180(); |