diff options
author | Strangerke | 2014-03-29 08:54:25 +0100 |
---|---|---|
committer | Strangerke | 2014-03-29 08:54:25 +0100 |
commit | e8de00f8770ab43259176400a9245006bc3b327a (patch) | |
tree | 7197a1a926742a9d6c68574eda2c0ee52e7af3fe /engines/mads/nebular | |
parent | f983add480db83a47ccdf2a860d5c9c1fbc664a2 (diff) | |
download | scummvm-rg350-e8de00f8770ab43259176400a9245006bc3b327a.tar.gz scummvm-rg350-e8de00f8770ab43259176400a9245006bc3b327a.tar.bz2 scummvm-rg350-e8de00f8770ab43259176400a9245006bc3b327a.zip |
MADS: Some more renaming in scene 202
Diffstat (limited to 'engines/mads/nebular')
-rw-r--r-- | engines/mads/nebular/globals_nebular.cpp | 1 | ||||
-rw-r--r-- | engines/mads/nebular/globals_nebular.h | 2 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes2.cpp | 8 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes2.h | 4 |
4 files changed, 7 insertions, 8 deletions
diff --git a/engines/mads/nebular/globals_nebular.cpp b/engines/mads/nebular/globals_nebular.cpp index e2886ee293..80e8dedd3b 100644 --- a/engines/mads/nebular/globals_nebular.cpp +++ b/engines/mads/nebular/globals_nebular.cpp @@ -47,7 +47,6 @@ Globals::Globals() { _v8 = 0; _abortVal = 0; _v8425C = 0; - _v84260 = 0; _v84262 = 0; _v84264 = 0; _v84266 = 0; diff --git a/engines/mads/nebular/globals_nebular.h b/engines/mads/nebular/globals_nebular.h index eebbd8ed25..992e00ab72 100644 --- a/engines/mads/nebular/globals_nebular.h +++ b/engines/mads/nebular/globals_nebular.h @@ -295,7 +295,7 @@ public: int _v8; int _abortVal; uint32 _v8425C; - int _v84260, _v84262, _v84264, _v84266, _v84268; + int _v84262, _v84264, _v84266, _v84268; public: /** * Constructor diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp index 2f81b780fe..ed43275451 100644 --- a/engines/mads/nebular/nebular_scenes2.cpp +++ b/engines/mads/nebular/nebular_scenes2.cpp @@ -580,7 +580,7 @@ void Scene202::step() { } } - if ((_scene->_activeAnimation->getCurrentFrame() == 160) && (_globals._v84260 != _scene->_activeAnimation->getCurrentFrame())) { + if ((_scene->_activeAnimation->getCurrentFrame() == 160) && (_meteoFrame != _scene->_activeAnimation->getCurrentFrame())) { Common::Point msgPos; int msgFlag; if (!_ladderTopFl) { @@ -599,11 +599,11 @@ void Scene202::step() { _toTeleportFl = true; } - if (_scene->_activeAnimation->getCurrentFrame() == _globals._v84260) { + if (_scene->_activeAnimation->getCurrentFrame() == _meteoFrame) { return; } - _globals._v84260 = _scene->_activeAnimation->getCurrentFrame(); + _meteoFrame = _scene->_activeAnimation->getCurrentFrame(); int randVal = _vm->getRandomNumber(1, 1000); int frameStep = -1; @@ -649,7 +649,7 @@ void Scene202::step() { int nextFrame = 1 + _scene->_activeAnimation->getCurrentFrame() - frameStep; if (nextFrame) { _scene->_activeAnimation->setCurrentFrame(nextFrame); - _globals._v84260 = nextFrame; + _meteoFrame = nextFrame; } } diff --git a/engines/mads/nebular/nebular_scenes2.h b/engines/mads/nebular/nebular_scenes2.h index 143b24c22f..0f247f3146 100644 --- a/engines/mads/nebular/nebular_scenes2.h +++ b/engines/mads/nebular/nebular_scenes2.h @@ -64,7 +64,7 @@ public: class Scene202: public Scene2xx { private: bool _activeMsgFl, _ladderTopFl, _waitingMeteoFl, _toStationFl, _toTeleportFl; - int _ladderHotspotId, _lastRoute, _stationCounter; + int _ladderHotspotId, _lastRoute, _stationCounter, _meteoFrame; uint32 _meteoClock1, _meteoClock2, _startTime; int subStep1(int randVal); @@ -75,7 +75,7 @@ private: public: Scene202(MADSEngine *vm) : Scene2xx(vm), _activeMsgFl(false), _ladderTopFl(false), _waitingMeteoFl(false), _ladderHotspotId(-1), _meteoClock1(0), _meteoClock2(0), _toStationFl(false), _toTeleportFl(false), - _lastRoute(0), _stationCounter(0) {} + _lastRoute(0), _stationCounter(0), _meteoFrame(0) {} virtual void setup(); virtual void enter(); virtual void step(); |