aboutsummaryrefslogtreecommitdiff
path: root/engines/m4/animation.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2010-06-14 06:33:24 +0000
committerPaul Gilbert2010-06-14 06:33:24 +0000
commit58487da20bf0115cfdefc2769c831c64b22d524c (patch)
tree6df9e5595b72e04aebab680f9e5de7c40fde2598 /engines/m4/animation.cpp
parent6fb462e6b05c5ead3fefe97e18d31f4835d5e321 (diff)
downloadscummvm-rg350-58487da20bf0115cfdefc2769c831c64b22d524c.tar.gz
scummvm-rg350-58487da20bf0115cfdefc2769c831c64b22d524c.tar.bz2
scummvm-rg350-58487da20bf0115cfdefc2769c831c64b22d524c.zip
Moved the actionNouns array from the scene to the globals object, since the scene will no longer be active during animation sequences
svn-id: r49646
Diffstat (limited to 'engines/m4/animation.cpp')
-rw-r--r--engines/m4/animation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/m4/animation.cpp b/engines/m4/animation.cpp
index a9d52a54c1..c39a1f0cd2 100644
--- a/engines/m4/animation.cpp
+++ b/engines/m4/animation.cpp
@@ -264,7 +264,7 @@ void MadsAnimation::load(const Common::String &filename, int abortTimers) {
_abortMode = _madsVm->scene()->_abortTimersMode2;
for (int i = 0; i < 3; ++i)
- _actionNouns[i] = _madsVm->scene()->actionNouns[i];
+ _actionNouns[i] = _madsVm->globals()->actionNouns[i];
// Initialise kernel message list
for (uint i = 0; i < _messages.size(); ++i)
@@ -436,7 +436,7 @@ void MadsAnimation::update() {
if (_abortMode != ABORTMODE_1) {
// Copy the noun list
for (int i = 0; i < 3; ++i)
- _madsVm->scene()->actionNouns[i] = _actionNouns[i];
+ _madsVm->globals()->actionNouns[i] = _actionNouns[i];
}
}
}