diff options
| author | Paul Gilbert | 2010-07-23 09:49:40 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2010-07-23 09:49:40 +0000 |
| commit | 42851e047f9c8bef8d20a1854ff50dfd11a41741 (patch) | |
| tree | b6e1fcd36b2f63d160324978eb47833131d88245 /engines/m4/animation.cpp | |
| parent | 05999d1e5907747a39d3f3e4b73bac1929031600 (diff) | |
| download | scummvm-rg350-42851e047f9c8bef8d20a1854ff50dfd11a41741.tar.gz scummvm-rg350-42851e047f9c8bef8d20a1854ff50dfd11a41741.tar.bz2 scummvm-rg350-42851e047f9c8bef8d20a1854ff50dfd11a41741.zip | |
Lots of action related fields added; scroll over default action is now displayed on-screen
svn-id: r51200
Diffstat (limited to 'engines/m4/animation.cpp')
| -rw-r--r-- | engines/m4/animation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/m4/animation.cpp b/engines/m4/animation.cpp index 0ead57aac9..37314eff44 100644 --- a/engines/m4/animation.cpp +++ b/engines/m4/animation.cpp @@ -287,8 +287,8 @@ void MadsAnimation::load(const Common::String &filename, int abortTimers) { _abortTimers = abortTimers; _abortMode = _madsVm->scene()->_abortTimersMode2; - for (int i = 0; i < 3; ++i) - _actionNouns[i] = _madsVm->globals()->actionNouns[i]; + if (_madsVm->_scene) + _actionNouns = _madsVm->scene()->_action._action; // Initialise kernel message list for (uint i = 0; i < _messages.size(); ++i) @@ -464,8 +464,8 @@ void MadsAnimation::update() { if (_abortMode != ABORTMODE_1) { // Copy the noun list - for (int i = 0; i < 3; ++i) - _madsVm->globals()->actionNouns[i] = _actionNouns[i]; + if (_madsVm->_scene) + _madsVm->scene()->_action._action = _actionNouns; } } } |