Centralised the update logic for the various system lists into the MadsView class

svn-id: r50365

4 files changed, 12 insertions, 3 deletions

diff --git a/engines/m4/mads_anim.cpp b/engines/m4/mads_anim.cpp
index fb565a927c..c2e9ea4eee 100644
--- a/engines/m4/mads_anim.cpp
+++ b/engines/m4/mads_anim.cpp
@@ -547,7 +547,7 @@ void AnimviewView::updateState() {
 }
 
 void AnimviewView::readNextCommand() {
-static bool tempFlag = false;//****DEBUG - Temporarily allow me to skip several intro scenes ****
+static bool tempFlag = true;//****DEBUG - Temporarily allow me to skip several intro scenes ****
 
 	while (!_script->eos() && !_script->err()) {
 		if (!tempFlag) {
diff --git a/engines/m4/mads_scene.cpp b/engines/m4/mads_scene.cpp
index 60fffadc07..73388a2325 100644
--- a/engines/m4/mads_scene.cpp
+++ b/engines/m4/mads_scene.cpp
@@ -297,7 +297,6 @@ void MadsScene::update() {
 
 void MadsScene::updateState() {
 	_sceneLogic.sceneStep();
-	_sequenceList.tick();
 
 	if ((_activeAnimation) && !_abortTimers) {
 		_activeAnimation->update();
@@ -307,7 +306,7 @@ void MadsScene::updateState() {
 		}
 	}
 
-	_kernelMessages.update();
+	MadsView::update();
 }
 
 int MadsScene::loadSceneSpriteSet(const char *setName) {
diff --git a/engines/m4/mads_views.cpp b/engines/m4/mads_views.cpp
index 08b579cfb0..7b0b1443a8 100644
--- a/engines/m4/mads_views.cpp
+++ b/engines/m4/mads_views.cpp
@@ -1238,6 +1238,11 @@ void MadsView::refresh() {
 	_textDisplay.cleanUp();
 }
 
+void MadsView::update() {
+	_sequenceList.tick();
+	_kernelMessages.update();
+}
+
 void MadsView::clearLists() {
 	_textDisplay.clear();
 	_kernelMessages.clear();
diff --git a/engines/m4/mads_views.h b/engines/m4/mads_views.h
index 843596412e..fc001740d3 100644
--- a/engines/m4/mads_views.h
+++ b/engines/m4/mads_views.h
@@ -170,6 +170,10 @@ public:
 	AbortTimerMode abortMode;
 	uint16 actionNouns[3];
 	char msg[100];
+
+	MadsKernelMessageEntry() {
+		flags = 0;
+	}
 };
 
 class MadsKernelMessageList {
@@ -404,6 +408,7 @@ public:
 	~MadsView();
 
 	void refresh();
+	void update();
 	void clearLists();
 };