From 58487da20bf0115cfdefc2769c831c64b22d524c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 14 Jun 2010 06:33:24 +0000
Subject: 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
---
 engines/m4/animation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/m4/animation.cpp')

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];
 			}
 		}
 	}
-- 
cgit v1.2.3