diff options
| author | Strangerke | 2014-03-22 21:20:39 +0100 |
|---|---|---|
| committer | Strangerke | 2014-03-22 21:22:55 +0100 |
| commit | db4e74f4dd1994bd468f78eca57800f9f3970b11 (patch) | |
| tree | dca0607f0a7d066d69a81ac2d8e1411d09afa5a5 /engines/mads | |
| parent | ef152fa2ba5d6e7040434415f5e472da3abc6c5f (diff) | |
| download | scummvm-rg350-db4e74f4dd1994bd468f78eca57800f9f3970b11.tar.gz scummvm-rg350-db4e74f4dd1994bd468f78eca57800f9f3970b11.tar.bz2 scummvm-rg350-db4e74f4dd1994bd468f78eca57800f9f3970b11.zip | |
MADS: Add _v8425C, set _globals._v7 as uint32
Diffstat (limited to 'engines/mads')
| -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_scenes8.cpp | 2 | ||||
| -rw-r--r-- | engines/mads/scene.cpp | 1 | ||||
| -rw-r--r-- | engines/mads/scene.h | 1 |
5 files changed, 7 insertions, 7 deletions
diff --git a/engines/mads/nebular/globals_nebular.h b/engines/mads/nebular/globals_nebular.h index 8d9d009744..f7e28fc59a 100644 --- a/engines/mads/nebular/globals_nebular.h +++ b/engines/mads/nebular/globals_nebular.h @@ -44,7 +44,7 @@ public: int _v4; int _v5; int _v6; - int _v7; + uint32 _v7; int _v8; int _abortVal; public: diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp index f9da681947..4acbe92475 100644 --- a/engines/mads/nebular/nebular_scenes2.cpp +++ b/engines/mads/nebular/nebular_scenes2.cpp @@ -418,8 +418,7 @@ void Scene202::enter() { _globals._v4 = 0; } - _globals._v7 = _scene->_frameStartTime; - warning("TODO: dword_8425C = _scene->_frameStartTime;"); + _game._scene._v8425C = _globals._v7 = _scene->_frameStartTime; if (_scene->_roomChanged) _game._objects.addToInventory(OBJ_NONE); @@ -484,7 +483,7 @@ void Scene202::step() { if (_game._abortTimers == 71) { _vm->_sound->command(3); _vm->_sound->command(9); - warning("TODO: dword_8425C = 900 + _scene->_frameStartTime;"); + _game._scene._v8425C = 900 + _scene->_frameStartTime; Common::Point msgPos; int msgFlag; if (_globals._v4 == 0) { @@ -555,8 +554,7 @@ void Scene202::step() { break; } - if (!_scene->_activeAnimation && (_globals[33] != 2) && (_globals._v7 <= _scene->_frameStartTime)) { - warning("TODO: && (dword_8425C <= _scene->_frameStartTime) {"); + if (!_scene->_activeAnimation && (_globals[33] != 2) && (_globals._v7 <= _scene->_frameStartTime) && (_game._scene._v8425C <= _scene->_frameStartTime)) { int randVal = _vm->getRandomNumber(499) + 1; int threshold = 1; if (_globals._v4) diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp index 2aa65d90f0..dd86b56a65 100644 --- a/engines/mads/nebular/nebular_scenes8.cpp +++ b/engines/mads/nebular/nebular_scenes8.cpp @@ -290,7 +290,7 @@ void Scene804::step() { } if (_scene->_activeAnimation->getCurrentFrame() == 80 && !_globals._v7) { _vm->_sound->command(22); - _globals._v7 = -1; + _globals._v7 = 0xFFFFFFFF; } } diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp index e01720f788..9ad494d07d 100644 --- a/engines/mads/scene.cpp +++ b/engines/mads/scene.cpp @@ -48,6 +48,7 @@ Scene::Scene(MADSEngine *vm): _vm(vm), _action(_vm), _depthSurface(vm), _activeAnimation = nullptr; _textSpacing = -1; _frameStartTime = 0; + _v8425C = 0; _layer = LAYER_GUI; _lookFlag = false; _highlightedHotspot = 0; diff --git a/engines/mads/scene.h b/engines/mads/scene.h index a51d820d1c..787c5e0951 100644 --- a/engines/mads/scene.h +++ b/engines/mads/scene.h @@ -117,6 +117,7 @@ public: int _destFacing; Common::Point _posAdjust; uint32 _frameStartTime; + uint32 _v8425C; Layer _layer; bool _lookFlag; int _highlightedHotspot; |