[Scummvm-cvs-logs] SF.net SVN: scummvm:[50365] scummvm/trunk/engines/m4

[dreammaster at users.sourceforge.net]

Revision: 50365
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50365&view=rev
Author:   dreammaster
Date:     2010-06-27 05:17:40 +0000 (Sun, 27 Jun 2010)

Log Message:
-----------
Centralised the update logic for the various system lists into the MadsView class

Modified Paths:
--------------
    scummvm/trunk/engines/m4/mads_anim.cpp
    scummvm/trunk/engines/m4/mads_scene.cpp
    scummvm/trunk/engines/m4/mads_views.cpp
    scummvm/trunk/engines/m4/mads_views.h

Modified: scummvm/trunk/engines/m4/mads_anim.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_anim.cpp	2010-06-27 05:12:37 UTC (rev 50364)
+++ scummvm/trunk/engines/m4/mads_anim.cpp	2010-06-27 05:17:40 UTC (rev 50365)
@@ -547,7 +547,7 @@
 }
 
 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) {

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-06-27 05:12:37 UTC (rev 50364)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-06-27 05:17:40 UTC (rev 50365)
@@ -297,7 +297,6 @@
 
 void MadsScene::updateState() {
 	_sceneLogic.sceneStep();
-	_sequenceList.tick();
 
 	if ((_activeAnimation) && !_abortTimers) {
 		_activeAnimation->update();
@@ -307,7 +306,7 @@
 		}
 	}
 
-	_kernelMessages.update();
+	MadsView::update();
 }
 
 int MadsScene::loadSceneSpriteSet(const char *setName) {

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-06-27 05:12:37 UTC (rev 50364)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-06-27 05:17:40 UTC (rev 50365)
@@ -1238,6 +1238,11 @@
 	_textDisplay.cleanUp();
 }
 
+void MadsView::update() {
+	_sequenceList.tick();
+	_kernelMessages.update();
+}
+
 void MadsView::clearLists() {
 	_textDisplay.clear();
 	_kernelMessages.clear();

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-06-27 05:12:37 UTC (rev 50364)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-06-27 05:17:40 UTC (rev 50365)
@@ -170,6 +170,10 @@
 	AbortTimerMode abortMode;
 	uint16 actionNouns[3];
 	char msg[100];
+
+	MadsKernelMessageEntry() {
+		flags = 0;
+	}
 };
 
 class MadsKernelMessageList {
@@ -404,6 +408,7 @@
 	~MadsView();
 
 	void refresh();
+	void update();
 	void clearLists();
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.