diff options
author | Paul Gilbert | 2010-06-14 06:33:24 +0000 |
---|---|---|
committer | Paul Gilbert | 2010-06-14 06:33:24 +0000 |
commit | 58487da20bf0115cfdefc2769c831c64b22d524c (patch) | |
tree | 6df9e5595b72e04aebab680f9e5de7c40fde2598 /engines/m4/mads_views.cpp | |
parent | 6fb462e6b05c5ead3fefe97e18d31f4835d5e321 (diff) | |
download | scummvm-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/mads_views.cpp')
-rw-r--r-- | engines/m4/mads_views.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/m4/mads_views.cpp b/engines/m4/mads_views.cpp index 5c6c01293e..af4177e6bb 100644 --- a/engines/m4/mads_views.cpp +++ b/engines/m4/mads_views.cpp @@ -404,7 +404,7 @@ int MadsKernelMessageList::add(const Common::Point &pt, uint fontColour, uint8 f rec.abortMode = _owner._abortTimersMode2; for (int i = 0; i < 3; ++i) - rec.actionNouns[i] = _madsVm->scene()->actionNouns[i]; + rec.actionNouns[i] = _madsVm->globals()->actionNouns[i]; if (flags & KMSG_OWNER_TIMEOUT) rec.frameTimer = _owner._ticksAmount + _owner._newTimeout; @@ -504,7 +504,7 @@ void MadsKernelMessageList::processText(int msgIndex) { if (_owner._abortTimersMode != ABORTMODE_1) { for (int i = 0; i < 3; ++i) - _madsVm->scene()->actionNouns[i] = msg.actionNouns[i]; + _madsVm->globals()->actionNouns[i] = msg.actionNouns[i]; } } } @@ -943,7 +943,7 @@ int MadsSequenceList::add(int spriteListIndex, int v0, int frameIndex, int trigg _entries[seqIndex].abortMode = _owner._abortTimersMode2; for (int i = 0; i < 3; ++i) - _entries[seqIndex].actionNouns[i] = _madsVm->scene()->actionNouns[i]; + _entries[seqIndex].actionNouns[i] = _madsVm->globals()->actionNouns[i]; return seqIndex; } |