ScummVM

Revision: 34786
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34786&view=rev
Author:   fingolfin
Date:     2008-10-12 22:06:31 +0000 (Sun, 12 Oct 2008)

Log Message:
-----------
Don't call Common::List::size() if you don't have to (it's an expensive operation, which has to iterate the whole List, while empty() works in constant time)

Modified Paths:
--------------
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/viewmgr.h

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2008-10-12 22:05:26 UTC (rev 34785)
+++ scummvm/trunk/engines/m4/m4.cpp	2008-10-12 22:06:31 UTC (rev 34786)
@@ -205,7 +205,7 @@
 	uint32 keycode = 0;
 
 	if ((event = _events->handleEvents()) != MEVENT_NO_EVENT) {
-		if (_viewManager->viewCount() > 0)
+		if (_viewManager->containsViews())
 			_viewManager->handleMouseEvents(event);
 	}
 

Modified: scummvm/trunk/engines/m4/viewmgr.h
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.h	2008-10-12 22:05:26 UTC (rev 34785)
+++ scummvm/trunk/engines/m4/viewmgr.h	2008-10-12 22:06:31 UTC (rev 34786)
@@ -176,7 +176,7 @@
 	}
 	bool contains(int screenType) { return getView(screenType) != NULL; }
 	View *getView(int screenType);
-	int viewCount() { return _views.size(); }
+	int containsViews() { return !_views.empty(); }
 
 	void showTextView(const char *textViewName, bool returnToMainMenu = true);
 	void showAnimView(const char *animViewName, bool returnToMainMenu = true);


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

Revision: 45651
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45651&view=rev
Author:   dreammaster
Date:     2009-11-04 08:38:32 +0000 (Wed, 04 Nov 2009)

Log Message:
-----------
Added support for loading the game's object list

Modified Paths:
--------------
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/console.h
    scummvm/trunk/engines/m4/globals.cpp
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/m4.cpp

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2009-11-04 08:05:12 UTC (rev 45650)
+++ scummvm/trunk/engines/m4/console.cpp	2009-11-04 08:38:32 UTC (rev 45651)
@@ -47,11 +47,26 @@
 	DCmd_Register("textview",		WRAP_METHOD(Console, cmdShowTextview));
 	DCmd_Register("animview",		WRAP_METHOD(Console, cmdShowAnimview));
 	DCmd_Register("anim",			WRAP_METHOD(Console, cmdPlayAnimation));
+	DCmd_Register("object",			WRAP_METHOD(Console, cmdObject));
 }
 
 Console::~Console() {
 }
 
+static int strToInt(const char *s) {
+	if (!*s)
+		// No string at all
+		return 0;
+	else if (toupper(s[strlen(s) - 1]) != 'H')
+		// Standard decimal string
+		return atoi(s);
+
+	// Hexadecimal string
+	uint tmp;
+	sscanf(s, "%xh", &tmp);
+	return (int)tmp;
+}
+
 bool Console::cmdLoadScene(int argc, const char **argv) {
 	if (argc != 2) {
 		DebugPrintf("Usage: %s <scene number>\n", argv[0]);
@@ -284,4 +299,49 @@
 	return true;
 }
 
+bool Console::cmdObject(int argc, const char **argv) {
+	if (_vm->isM4()) {
+		DebugPrintf("Command not implemented for M4 games\n");
+	} else if (argc == 1) {
+		DebugPrintf("Usage: object ['list' | '#objnum']\n");
+	} else if (!strcmp(argv[1], "list")) {
+		// List of objects
+		for (uint objStart = 0; objStart < _vm->_globals->getObjectsSize(); objStart += 5) {
+			DebugPrintf("%2d - ", objStart);
+			for (uint objId = objStart; objId < MIN(_vm->_globals->getObjectsSize(), objStart + 5); ++objId) {
+				if (objId != objStart) DebugPrintf(", ");
+				uint16 descId = _vm->_globals->getObject(objId)->descId - 1;
+				DebugPrintf("%s", _vm->_globals->getVocab(descId));
+			}
+
+			DebugPrintf("\n");
+		}
+
+		DebugPrintf("\n");
+	} else {
+		// Print the details of a specific object
+		int id = strToInt(argv[1]);
+
+		if ((id < 0) || (id >= (int)_vm->_globals->getObjectsSize()))
+			DebugPrintf("Invalid object specified\n");
+		else {
+			const MadsObject *obj = _vm->_globals->getObject(id);
+
+			DebugPrintf("Object #%d (%s) room=%d vocabs=%d", id, _vm->_globals->getVocab(obj->descId - 1),
+				obj->roomNumber, obj->vocabCount);
+			if (obj->vocabCount > 0) {
+				DebugPrintf(" - ");
+				for (int i = 0; i < obj->vocabCount; ++i) {
+					if (i != 0) DebugPrintf(", ");
+					DebugPrintf("%s (%d)/%d", _vm->_globals->getVocab(obj->vocabList[i].vocabId - 1),
+						obj->vocabList[i].vocabId, obj->vocabList[i].unk);
+				}
+			}
+			DebugPrintf("\n");
+		}
+	}
+
+	return true;
+}
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/console.h
===================================================================
--- scummvm/trunk/engines/m4/console.h	2009-11-04 08:05:12 UTC (rev 45650)
+++ scummvm/trunk/engines/m4/console.h	2009-11-04 08:38:32 UTC (rev 45651)
@@ -53,6 +53,7 @@
 	bool cmdShowTextview(int argc, const char **argv);
 	bool cmdShowAnimview(int argc, const char **argv);
 	bool cmdPlayAnimation(int argc, const char **argv);
+	bool cmdObject(int argc, const char **argv);
 
 private:
 	M4Engine *_vm;

Modified: scummvm/trunk/engines/m4/globals.cpp
===================================================================
--- scummvm/trunk/engines/m4/globals.cpp	2009-11-04 08:05:12 UTC (rev 45650)
+++ scummvm/trunk/engines/m4/globals.cpp	2009-11-04 08:38:32 UTC (rev 45651)
@@ -359,7 +359,17 @@
 	_vm->res()->toss("messages.dat");
 }
 
-char* Globals::loadMessage(uint index) {
+void Globals::loadMadsObjects() {
+	Common::SeekableReadStream *objList = _vm->res()->get("objects.dat");
+	int numObjects = objList->readUint16LE();
+
+	for (int i = 0; i < numObjects; ++i)
+		_madsObjects.push_back(MadsObjectArray::value_type(new MadsObject(objList)));
+
+	_vm->res()->toss("objects.dat");
+}
+
+const char *Globals::loadMessage(uint index) {
 	if (index > _madsMessages.size() - 1) {
 		warning("Invalid message index: %i", index);
 		return NULL;
@@ -451,5 +461,23 @@
 	return false;
 }
 
+/*--------------------------------------------------------------------------*/
 
+MadsObject::MadsObject(Common::SeekableReadStream *stream) {
+	// Get the next data block
+	uint8 obj[0x30];
+	stream->read(obj, 0x30);
+
+	// Extract object data fields
+	descId = READ_LE_UINT16(&obj[0]);
+	roomNumber = READ_LE_UINT16(&obj[2]);
+	vocabCount = obj[5];
+	assert(vocabCount <= 3);
+
+	for (int i = 0; i < vocabCount; ++i) {
+		vocabList[i].unk = READ_LE_UINT16(&obj[6 + i * 4]);
+		vocabList[i].vocabId = READ_LE_UINT16(&obj[8 + i * 4]);
+	}
+}
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2009-11-04 08:05:12 UTC (rev 45650)
+++ scummvm/trunk/engines/m4/globals.h	2009-11-04 08:38:32 UTC (rev 45651)
@@ -30,6 +30,9 @@
 #include "common/rect.h"
 #include "common/scummsys.h"
 
+#include "common/file.h"
+#include "common/ptr.h"
+
 namespace M4 {
 
 class M4Engine;
@@ -146,6 +149,27 @@
 
 #define TOTAL_NUM_VARIABLES 256
 
+#define PLAYER_INVENTORY 2
+
+struct VocabEntry {
+	uint16 unk;
+	uint16 vocabId;
+};
+
+class MadsObject {
+public:
+	MadsObject() {};
+	MadsObject(Common::SeekableReadStream *stream);
+	bool isInInventory() const { return roomNumber == PLAYER_INVENTORY; };
+
+	uint16 descId;
+	uint16 roomNumber;
+	uint8 vocabCount;
+	VocabEntry vocabList[3];
+};
+
+typedef Common::Array<Common::SharedPtr<MadsObject> > MadsObjectArray;
+
 class Globals {
 private:
 	struct MessageItem {
@@ -159,6 +183,7 @@
 	Common::Array<char* > _madsVocab;
 	Common::Array<char* > _madsQuotes;
 	Common::Array<MessageItem* > _madsMessages;
+	MadsObjectArray _madsObjects;
 public:
 	Globals(M4Engine *vm);
 	~Globals();
@@ -169,15 +194,19 @@
 
 	void loadMadsVocab();
 	uint32 getVocabSize() { return _madsVocab.size(); }
-	char* getVocab(uint32 index) { return _madsVocab[index]; }
+	const char *getVocab(uint32 index) { return _madsVocab[index]; }
 
 	void loadMadsQuotes();
 	uint32 getQuotesSize() { return _madsQuotes.size(); }
-	char* getQuote(uint32 index) { return _madsQuotes[index]; }
+	const char *getQuote(uint32 index) { return _madsQuotes[index]; }
 
 	void loadMadsMessagesInfo();
 	uint32 getMessagesSize() { return _madsMessages.size(); }
-	char* loadMessage(uint index);
+	const char *loadMessage(uint index);
+
+	void loadMadsObjects();
+	uint32 getObjectsSize() { return _madsObjects.size(); }
+	const MadsObject *getObject(uint32 index) { return _madsObjects[index].get(); }
 };
 
 #define PLAYER_FIELD_LENGTH 40

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2009-11-04 08:05:12 UTC (rev 45650)
+++ scummvm/trunk/engines/m4/m4.cpp	2009-11-04 08:38:32 UTC (rev 45651)
@@ -282,8 +282,8 @@
 	_globals->loadMadsVocab();			// vocab.dat
 	_globals->loadMadsQuotes();			// quotes.dat
 	_globals->loadMadsMessagesInfo();	// messages.dat
-	// TODO: objects.dat
-	// TODO: hoganus.dat (what is it used for?)
+	_globals->loadMadsObjects();
+	
 
 	// Test code to dump all messages to the console
 	//for (int i = 0; i < _globals->getMessagesSize(); i++)


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

Revision: 45827
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45827&view=rev
Author:   dreammaster
Date:     2009-11-11 09:55:05 +0000 (Wed, 11 Nov 2009)

Log Message:
-----------
Removed all the '- 1' from calls to get vocabs, centralising it in the getVocab method. This is correct, as the first element in the game vocab list is '1', not '0'.

Modified Paths:
--------------
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/hotspot.cpp
    scummvm/trunk/engines/m4/mads_anim.cpp
    scummvm/trunk/engines/m4/scene.h

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2009-11-11 02:25:42 UTC (rev 45826)
+++ scummvm/trunk/engines/m4/console.cpp	2009-11-11 09:55:05 UTC (rev 45827)
@@ -310,7 +310,7 @@
 			DebugPrintf("%2d - ", objStart);
 			for (uint objId = objStart; objId < MIN<uint>(_vm->_globals->getObjectsSize(), objStart + 5); ++objId) {
 				if (objId != objStart) DebugPrintf(", ");
-				uint16 descId = _vm->_globals->getObject(objId)->descId - 1;
+				uint16 descId = _vm->_globals->getObject(objId)->descId;
 				DebugPrintf("%s", _vm->_globals->getVocab(descId));
 			}
 
@@ -327,13 +327,13 @@
 		else {
 			const MadsObject *obj = _vm->_globals->getObject(id);
 
-			DebugPrintf("Object #%d (%s) room=%d vocabs=%d", id, _vm->_globals->getVocab(obj->descId - 1),
+			DebugPrintf("Object #%d (%s) room=%d vocabs=%d", id, _vm->_globals->getVocab(obj->descId),
 				obj->roomNumber, obj->vocabCount);
 			if (obj->vocabCount > 0) {
 				DebugPrintf(" - ");
 				for (int i = 0; i < obj->vocabCount; ++i) {
 					if (i != 0) DebugPrintf(", ");
-					DebugPrintf("%s (%d)/%d", _vm->_globals->getVocab(obj->vocabList[i].vocabId - 1),
+					DebugPrintf("%s (%d)/%d", _vm->_globals->getVocab(obj->vocabList[i].vocabId),
 						obj->vocabList[i].vocabId, obj->vocabList[i].unk);
 				}
 			}

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2009-11-11 02:25:42 UTC (rev 45826)
+++ scummvm/trunk/engines/m4/globals.h	2009-11-11 09:55:05 UTC (rev 45827)
@@ -194,7 +194,11 @@
 
 	void loadMadsVocab();
 	uint32 getVocabSize() { return _madsVocab.size(); }
-	const char *getVocab(uint32 index) { return _madsVocab[index]; }
+	const char *getVocab(uint32 index) { 
+		// Vocab list is 1-based, so always subtract one from index provided
+		assert((index > 0) && (index <= _madsVocab.size()));
+		return _madsVocab[index - 1]; 
+	}
 
 	void loadMadsQuotes();
 	uint32 getQuotesSize() { return _madsQuotes.size(); }

Modified: scummvm/trunk/engines/m4/hotspot.cpp
===================================================================
--- scummvm/trunk/engines/m4/hotspot.cpp	2009-11-11 02:25:42 UTC (rev 45826)
+++ scummvm/trunk/engines/m4/hotspot.cpp	2009-11-11 09:55:05 UTC (rev 45827)
@@ -51,6 +51,7 @@
 }
 
 HotSpot::~HotSpot() {
+	free(_vocab);
 }
 
 void HotSpot::setRect(int x1, int y1, int x2, int y2) {
@@ -273,10 +274,10 @@
 			currentHotSpot->setVerb("");
 
 			if (currentHotSpot->getVocabID() > 0)
-				currentHotSpot->setVocab(_vm->_globals->getVocab(currentHotSpot->getVocabID() - 1));
+				currentHotSpot->setVocab(_vm->_globals->getVocab(currentHotSpot->getVocabID()));
 
 			if (currentHotSpot->getVerbID() > 0)
-				currentHotSpot->setVerb(_vm->_globals->getVocab(currentHotSpot->getVerbID() - 1));
+				currentHotSpot->setVerb(_vm->_globals->getVocab(currentHotSpot->getVerbID()));
 		}
 	}
 }

Modified: scummvm/trunk/engines/m4/mads_anim.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_anim.cpp	2009-11-11 02:25:42 UTC (rev 45826)
+++ scummvm/trunk/engines/m4/mads_anim.cpp	2009-11-11 09:55:05 UTC (rev 45827)
@@ -25,6 +25,7 @@
 
 #include "m4/mads_anim.h"
 #include "m4/m4.h"
+#include "m4/compression.h"
 
 namespace M4 {
 
@@ -491,8 +492,6 @@
 		strcat(_resourceName, ".res");
 
 	_script = _vm->res()->get(_resourceName);
-
-	processLines();
 }
 
 bool AnimviewView::onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents) {
@@ -508,37 +507,97 @@
 }
 
 void AnimviewView::updateState() {
-	char bgFile[10];
-	int bgNumber = 0;
+	if (!_script)
+		return;
 
 	// Only update state if wait period has expired
 	if (_previousUpdate > 0) {
-		if (g_system->getMillis() - _previousUpdate < 3000) {
+		if (g_system->getMillis() - _previousUpdate < 100)
 			return;
-		} else {
-			// time for an update
-			_previousUpdate = g_system->getMillis();
-		}
-	} else {
+
 		_previousUpdate = g_system->getMillis();
-		return;
 	}
 
-	strncpy(bgFile, _currentFile, 5);
-	bgFile[0] = bgFile[2];
-	bgFile[1] = bgFile[3];
-	bgFile[2] = bgFile[4];
-	bgFile[3] = '\0';
-	bgNumber = atoi(bgFile);
-	sprintf(bgFile, "rm%i.art", bgNumber);
+	// Check if we're ready for the next command
+	bool animRunning = false;
+	if (!animRunning) {
+		if (_script->eos() ||  _script->err()) {
+			scriptDone();
+			return;
+		}
+		
+		readNextCommand();
 
+		// FIXME: Replace flag with proper animation end check
+		animRunning = true;
+	}
+}
+
+void AnimviewView::readNextCommand() {
+	while (!_script->eos() && !_script->err()) {
+		strncpy(_currentLine, _script->readLine().c_str(), 79);
+
+		// Process any switches on the line
+		char *cStart = strchr(_currentLine, '-');
+		while (cStart) {
+			// Loop for possible multiple commands on one line
+			char *cEnd = strchr(_currentLine, ' ');
+			if (!cEnd)
+				error("Unterminated command '%s' in response file", _currentLine);
+
+			*cEnd = '\0';
+			processCommand();
+
+			// Copy rest of line (if any) to start of buffer
+			// Don't use strcpy() here, because if the
+			// rest of the line is the longer of the two
+			// strings, the memory areas will overlap.
+			memmove(_currentLine, cEnd + 1, strlen(cEnd + 1) + 1);
+
+			cStart = strchr(_currentLine, '-');
+		}
+	
+		// If there's something left, presume it's a resource name to process
+		if (_currentLine[0])
+			break;
+	}
+
+	if (strchr(_currentLine, '.') == NULL)
+		strcat(_currentLine, ".aa");
+
+	AAFile aaFile(_currentLine, _vm);
+
+	// Initial validation
+	if (aaFile.flags & AA_HAS_FONT) {
+		assert(_vm->_resourceManager->resourceExists(aaFile.fontResource.c_str()));
+	}
+
+	for (int seriesCtr = 0; seriesCtr < aaFile.seriesCount; ++seriesCtr)
+		assert(_vm->_resourceManager->resourceExists(aaFile.filenames[seriesCtr].c_str()));
+
+	// Start sound
+	if (aaFile.flags & AA_HAS_SOUND)
+	{
+		char buffer[100];
+		strcpy(buffer, aaFile.soundName.c_str());
+		buffer[0] = 'A';	// A for Adlib resource
+
+		Common::SeekableReadStream *stream = _vm->_resourceManager->get(buffer);
+		
+		_vm->_resourceManager->toss(buffer);
+	}
+	
+
+	char artFile[80];
+	sprintf(artFile, "rm%d.art", aaFile.roomNumber);
+
 	// Not all scenes have a background. If there is one, refresh it
-	if (_vm->_resourceManager->resourceExists(bgFile)) {
+	if (_vm->_resourceManager->resourceExists(artFile)) {
 		if (_palData) {
 			_vm->_palette->deleteRange(_palData);
 			delete _palData;
 		}
-		_bgSurface.loadBackground(bgNumber, &_palData);
+		_bgSurface.loadBackground(aaFile.roomNumber, &_palData);
 		_vm->_palette->addRange(_palData);
 		_bgSurface.translate(_palData);
 	}
@@ -581,10 +640,10 @@
 	int yp = (height() - _bgSurface.height()) / 2;
 	_bgSurface.copyTo(this, 0, yp);
 
-	// Read next line
-	processLines();
+	_vm->_resourceManager->toss(_currentLine);
 }
 
+
 void AnimviewView::scriptDone() {
 	AnimviewCallback fn = _callback;
 	M4Engine *vm = _vm;
@@ -596,52 +655,6 @@
 		fn(vm);
 }
 
-void AnimviewView::processLines() {
-	strncpy(_currentLine, _script->readLine().c_str(), 79);
-	if (_script->eos() || _script->err()) {
-		// end of script, end animation
-		scriptDone();
-		return;
-	}
-
-	while (!_script->eos() && !_script->err()) {
-		// Process the line
-		char *cStart = strchr(_currentLine, '-');
-		if (cStart) {
-			while (cStart) {
-				// Loop for possible multiple commands on one line
-				char *cEnd = strchr(_currentLine, ' ');
-				if (!cEnd)
-					error("Unterminated command '%s' in response file", _currentLine);
-
-				*cEnd = '\0';
-				processCommand();
-
-				// Copy rest of line (if any) to start of buffer
-				// Don't use strcpy() here, because if the
-				// rest of the line is the longer of the two
-				// strings, the memory areas will overlap.
-				memmove(_currentLine, cEnd + 1, strlen(cEnd + 1) + 1);
-
-				cStart = strchr(_currentLine, '-');
-			}
-
-			if (_currentLine[0]) {
-				sprintf(_currentFile, "%s", _currentLine);
-				//printf("File: %s\n", _currentLine);
-				break;
-			}
-
-		} else {
-			sprintf(_currentFile, "%s", _currentLine);
-			//printf("File: %s\n", _currentLine);
-			break;
-		}
-
-		strncpy(_currentLine, _script->readLine().c_str(), 79);
-	}
-}
-
 /*
 Switches are: (taken from the help of the original executable)
   -b       Toggle background load status off/on.
@@ -705,4 +718,45 @@
 	}
 }
 
+AAFile::AAFile(const char *resourceName, M4Engine* vm): MadsPack(resourceName, vm) {
+	Common::MemoryReadStream stream1(*getItemStream(1));
+	Common::MemoryReadStream stream2(*getItemStream(2));
+
+	Common::MemoryReadStream stream(*getItemStream(0));
+printf("ss %d %d %d\n", stream.size(), stream1.size(), stream2.size());
+	seriesCount = stream.readUint16LE();
+	frameCount = stream.readUint16LE();
+	frameEntryCount = stream.readUint16LE();
+	stream.skip(3);
+	flags = stream.readByte();
+	stream.skip(4);
+	roomNumber = stream.readUint16LE();
+	stream.skip(10);
+	frameTicks = stream.readUint16LE();
+
+	stream.skip(21);
+	for (int i = 0; i < 10; ++i) {
+		char filename[13];
+		stream.read(filename, 13);
+		filenames.push_back(Common::String(filename, 13));
+	}
+
+	stream.skip(81);
+	char name[100];
+	stream.read(name, 13);
+	lbmFilename = Common::String(name, 13);
+
+	stream.skip(365);
+	stream.read(name, 13);
+	spritesFilename = Common::String(name, 13);
+
+	stream.skip(48);
+	stream.read(name, 13);
+	soundName = Common::String(name, 13);
+
+	stream.skip(26);
+	stream.read(name, 14);
+	fontResource = Common::String(name, 14);
 }
+
+}

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2009-11-11 02:25:42 UTC (rev 45826)
+++ scummvm/trunk/engines/m4/scene.h	2009-11-11 09:55:05 UTC (rev 45827)
@@ -44,17 +44,17 @@
 #define MADS_SURFACE_HEIGHT 156
 
 enum MADSVerbs {
-	kVerbLook	= 2,
-	kVerbTake	= 3,
-	kVerbPush	= 4,
-	kVerbOpen	= 5,
-	kVerbPut	= 6,
-	kVerbTalkTo	= 7,
-	kVerbGive	= 8,
-	kVerbPull	= 9,
-	kVerbClose	= 10,
-	kVerbThrow	= 11,
-	kVerbWalkTo	= 12
+	kVerbLook	= 3,
+	kVerbTake	= 4,
+	kVerbPush	= 5,
+	kVerbOpen	= 6,
+	kVerbPut	= 7,
+	kVerbTalkTo	= 8,
+	kVerbGive	= 9,
+	kVerbPull	= 10,
+	kVerbClose	= 11,
+	kVerbThrow	= 12,
+	kVerbWalkTo	= 13
 };
 
 struct SceneResources {


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

Revision: 45856
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45856&view=rev
Author:   dreammaster
Date:     2009-11-12 10:07:44 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
Added a staticres file with the MADS articles list, and added an article field to the MADSObject class

Modified Paths:
--------------
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/globals.cpp
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/module.mk

Added Paths:
-----------
    scummvm/trunk/engines/m4/staticres.cpp
    scummvm/trunk/engines/m4/staticres.h

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2009-11-12 09:27:41 UTC (rev 45855)
+++ scummvm/trunk/engines/m4/console.cpp	2009-11-12 10:07:44 UTC (rev 45856)
@@ -26,6 +26,7 @@
 #include "m4/m4.h"
 #include "m4/console.h"
 #include "m4/scene.h"
+#include "m4/staticres.h"
 
 namespace M4 {
 
@@ -327,8 +328,9 @@
 		else {
 			const MadsObject *obj = _vm->_globals->getObject(id);
 
-			DebugPrintf("Object #%d (%s) room=%d vocabs=%d", id, _vm->_globals->getVocab(obj->descId),
-				obj->roomNumber, obj->vocabCount);
+			DebugPrintf("Object #%d (%s) room=%d article=%d/%s vocabs=%d", id, _vm->_globals->getVocab(obj->descId),
+				obj->roomNumber, (int)obj->article, englishMADSArticleList[obj->article], obj->vocabCount);
+
 			if (obj->vocabCount > 0) {
 				DebugPrintf(" - ");
 				for (int i = 0; i < obj->vocabCount; ++i) {

Modified: scummvm/trunk/engines/m4/globals.cpp
===================================================================
--- scummvm/trunk/engines/m4/globals.cpp	2009-11-12 09:27:41 UTC (rev 45855)
+++ scummvm/trunk/engines/m4/globals.cpp	2009-11-12 10:07:44 UTC (rev 45856)
@@ -471,6 +471,7 @@
 	// Extract object data fields
 	descId = READ_LE_UINT16(&obj[0]);
 	roomNumber = READ_LE_UINT16(&obj[2]);
+	article = (MADSArticles)obj[4];
 	vocabCount = obj[5];
 	assert(vocabCount <= 3);
 

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2009-11-12 09:27:41 UTC (rev 45855)
+++ scummvm/trunk/engines/m4/globals.h	2009-11-12 10:07:44 UTC (rev 45856)
@@ -151,6 +151,18 @@
 
 #define PLAYER_INVENTORY 2
 
+enum MADSArticles {
+	kArticleNone	= 0,
+	kArticleWith	= 1,
+	kArticleTo		= 2,
+	kArticleAt		= 3,
+	kArticleFrom	= 4,
+	kArticleOn		= 5,
+	kArticleIn		= 6,
+	kArticleUnder	= 7,
+	kArticleBehind	= 8
+};
+
 struct VocabEntry {
 	uint16 unk;
 	uint16 vocabId;
@@ -164,6 +176,7 @@
 
 	uint16 descId;
 	uint16 roomNumber;
+	MADSArticles article;
 	uint8 vocabCount;
 	VocabEntry vocabList[3];
 };

Modified: scummvm/trunk/engines/m4/module.mk
===================================================================
--- scummvm/trunk/engines/m4/module.mk	2009-11-12 09:27:41 UTC (rev 45855)
+++ scummvm/trunk/engines/m4/module.mk	2009-11-12 10:07:44 UTC (rev 45856)
@@ -27,6 +27,7 @@
 	script.o \
 	sound.o \
 	sprite.o \
+	staticres.o \
 	viewmgr.o \
 	woodscript.o \
 	ws_machine.o \

Added: scummvm/trunk/engines/m4/staticres.cpp
===================================================================
--- scummvm/trunk/engines/m4/staticres.cpp	                        (rev 0)
+++ scummvm/trunk/engines/m4/staticres.cpp	2009-11-12 10:07:44 UTC (rev 45856)
@@ -0,0 +1,34 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "m4/staticres.h"
+
+namespace M4 {
+
+const char *englishMADSArticleList[9] = {
+	NULL, "with", "to", "at", "from", "on", "in", "under", "behind"
+};
+
+} // End of namespace M4


Property changes on: scummvm/trunk/engines/m4/staticres.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: scummvm/trunk/engines/m4/staticres.h
===================================================================
--- scummvm/trunk/engines/m4/staticres.h	                        (rev 0)
+++ scummvm/trunk/engines/m4/staticres.h	2009-11-12 10:07:44 UTC (rev 45856)
@@ -0,0 +1,38 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef M4_STATICRES_H
+#define M4_STATICRES_H
+
+#include "common/scummsys.h"
+#include "m4/m4.h"
+
+namespace M4 {
+
+extern const char *englishMADSArticleList[9];
+
+} // End of namespace M4
+
+#endif


Property changes on: scummvm/trunk/engines/m4/staticres.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native


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

Revision: 45911
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45911&view=rev
Author:   dreammaster
Date:     2009-11-15 08:22:14 +0000 (Sun, 15 Nov 2009)

Log Message:
-----------
Added support for needed MADS game configuration options

Modified Paths:
--------------
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/m4.h

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2009-11-15 02:37:37 UTC (rev 45910)
+++ scummvm/trunk/engines/m4/globals.h	2009-11-15 08:22:14 UTC (rev 45911)
@@ -204,6 +204,11 @@
 
 	// M4 variables
 	bool invSuppressClickSound;
+	// MADS variables
+	bool easyMouse;
+	bool invObjectsStill;
+	bool textWindowStill;
+	int storyMode;
 
 	void loadMadsVocab();
 	uint32 getVocabSize() { return _madsVocab.size(); }

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2009-11-15 02:37:37 UTC (rev 45910)
+++ scummvm/trunk/engines/m4/m4.cpp	2009-11-15 08:22:14 UTC (rev 45911)
@@ -283,8 +283,13 @@
 	_globals->loadMadsQuotes();			// quotes.dat
 	_globals->loadMadsMessagesInfo();	// messages.dat
 	_globals->loadMadsObjects();
-	
 
+	// Setup globals
+	_vm->_globals->easyMouse = true;
+	_vm->_globals->invObjectsStill = false;
+	_vm->_globals->textWindowStill = false;
+	_vm->_globals->storyMode = 0;
+
 	// Test code to dump all messages to the console
 	//for (int i = 0; i < _globals->getMessagesSize(); i++)
 	//printf("%s\n----------\n", _globals->loadMessage(i));

Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h	2009-11-15 02:37:37 UTC (rev 45910)
+++ scummvm/trunk/engines/m4/m4.h	2009-11-15 08:22:14 UTC (rev 45911)
@@ -99,6 +99,8 @@
 
 #define GAME_FRAME_DELAY 50
 
+#define VALIDATE_MADS assert(!_vm->isM4())
+
 inline void str_lower(char *s) { while (*s) { *s = tolower(*s); s++; } }
 inline void str_upper(char *s) { while (*s) { *s = toupper(*s); s++; } }
 


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

Revision: 45912
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45912&view=rev
Author:   dreammaster
Date:     2009-11-15 08:22:57 +0000 (Sun, 15 Nov 2009)

Log Message:
-----------
Added display of the rotating inventory objects

Modified Paths:
--------------
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2009-11-15 08:22:14 UTC (rev 45911)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2009-11-15 08:22:57 UTC (rev 45912)
@@ -309,6 +309,9 @@
 		vm->_mouse->cursorOn();
 		vm->_viewManager->addView(vm->_scene);
 		vm->_scene->loadScene(101);
+
+		// **DEBUG** - set the default object
+		vm->_scene->setSelectedObject(48);
 		return;
 
 	case SHOW_INTRO:

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2009-11-15 08:22:14 UTC (rev 45911)
+++ scummvm/trunk/engines/m4/scene.cpp	2009-11-15 08:22:57 UTC (rev 45912)
@@ -46,6 +46,7 @@
 	_codeSurface = new M4Surface();
 	_madsInterfaceSurface = new M4Surface();
 	_sceneSprites = NULL;
+	_objectSprites = NULL;
 	_palData = NULL;
 	_interfacePal = NULL;
 	_inverseColorTable = NULL;
@@ -68,6 +69,8 @@
 
 	if (_sceneSprites)
 		delete _sceneSprites;
+	if (_objectSprites)
+		delete _objectSprites;
 
 	_vm->_palette->deleteAllRanges();
 
@@ -441,12 +444,17 @@
 
 }
 
+static const int FRAME_SPEED = 8;
+static const int INVENTORY_X = 160;
+static const int INVENTORY_Y = 159;
+
 void Scene::update() {
 	// TODO: Needs a proper implementation
 	// NOTE: Don't copy the background when in M4 mode or WoodScript anims won't be shown
 	if (!_vm->isM4()) {
 		_backgroundSurface->copyTo(this);
 
+		// Handle display of any status text
 		if (_statusText[0]) {
 			// Text colors are inverted in Dragonsphere
 			if (_vm->getGameType() == GType_DragonSphere)
@@ -457,6 +465,21 @@
 			_vm->_font->setFont(FONT_MAIN_MADS);
 			_vm->_font->writeString(this, _statusText, (width() - _vm->_font->getWidth(_statusText)) / 2, 142, 0);
 		}
+
+		_madsInterfaceSurface->copyTo(this, 0, this->height() - _madsInterfaceSurface->height());
+
+		if (_objectSprites) {
+			// Display object sprite. Note that the frame number isn't used directly, because it would result
+			// in too fast an animation
+			M4Sprite *spr = _objectSprites->getFrame(_objectFrameNumber / FRAME_SPEED);
+			spr->copyTo(this, INVENTORY_X, INVENTORY_Y, 0);
+
+			if (!_vm->_globals->invObjectsStill) {
+				// If objetcs are to animated, move to the next frame
+				if (++_objectFrameNumber >= (_objectSprites->getCount() * FRAME_SPEED))
+					_objectFrameNumber = 0;
+			}
+		}
 	}
 }
 
@@ -667,4 +690,31 @@
 	boxSprites->getFrame(bottomRight)->copyTo(_backgroundSurface, curX, curY + 1);
 }
 
+/*--------------------------------------------------------------------------*/
+
+void Scene::setSelectedObject(int objectNumber) {
+	VALIDATE_MADS;
+
+	// Load inventory resource
+	if (_objectSprites) {
+		_vm->_palette->deleteRange(_objectPalData);
+		delete _objectSprites;
+	}
+
+	char resName[80];
+	sprintf(resName, "*OB%.3dI.SS", objectNumber);
+
+	Common::SeekableReadStream *data = _vm->res()->get(resName);
+	_objectSprites = new SpriteAsset(_vm, data, data->size(), resName);
+	_vm->res()->toss(resName);
+
+	// Slot it into available palette space
+	_objectPalData = _objectSprites->getRgbList();
+	_vm->_palette->addRange(_objectPalData);
+	_objectSprites->translate(_objectPalData, true);
+
+	_objectFrameNumber = 0;
+	_selectedObject = objectNumber;
+}
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2009-11-15 08:22:14 UTC (rev 45911)
+++ scummvm/trunk/engines/m4/scene.h	2009-11-15 08:22:57 UTC (rev 45912)
@@ -102,6 +102,8 @@
 	void onRefresh(RectList *rects, M4Surface *destSurface);
 	bool onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents);
 
+	void setSelectedObject(int objectNumber);
+
 private:
 	int _currentScene;
 	M4Surface *_backgroundSurface;
@@ -116,6 +118,12 @@
 	SpriteAsset *_walkerSprite;
 	char _statusText[100];
 
+	// Inventory related fields
+	int _selectedObject;
+	SpriteAsset *_objectSprites;
+	RGBList *_objectPalData;
+	int _objectFrameNumber;
+
 	void nextCommonCursor();
 };
 


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

Revision: 46152
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46152&view=rev
Author:   dreammaster
Date:     2009-11-26 11:48:43 +0000 (Thu, 26 Nov 2009)

Log Message:
-----------
Added the basics of a action list display

Modified Paths:
--------------
    scummvm/trunk/engines/m4/events.h
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/m4.h
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h

Modified: scummvm/trunk/engines/m4/events.h
===================================================================
--- scummvm/trunk/engines/m4/events.h	2009-11-26 10:59:46 UTC (rev 46151)
+++ scummvm/trunk/engines/m4/events.h	2009-11-26 11:48:43 UTC (rev 46152)
@@ -56,6 +56,7 @@
 
 enum M4CommonCursors {
 	CURSOR_ARROW = 0,
+	CURSOR_WAIT = 1,
 	CURSOR_HOURGLASS = 5,
 	CURSOR_LOOK = 6,
 	CURSOR_TAKE = 8,

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2009-11-26 10:59:46 UTC (rev 46151)
+++ scummvm/trunk/engines/m4/m4.cpp	2009-11-26 11:48:43 UTC (rev 46152)
@@ -182,6 +182,7 @@
 	}
 	_rails = new Rails();	// needs to be initialized before _scene
 	_scene = new Scene(this);
+	_actionsView = new ActionsView(this);
 	_dialogs = new Dialogs();
 	_viewManager = new ViewManager(this);
 	_inventory = new Inventory(this);
@@ -306,6 +307,7 @@
 		}
 
 		_viewManager->addView(_scene);
+		_viewManager->addView(_actionsView);
 
 		_font->setFont(FONT_MAIN_MADS);
 		_font->setColors(2, 1, 3);

Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h	2009-11-26 10:59:46 UTC (rev 46151)
+++ scummvm/trunk/engines/m4/m4.h	2009-11-26 11:48:43 UTC (rev 46152)
@@ -173,6 +173,7 @@
 	Font *_font;
 	Actor *_actor;
 	Scene *_scene;
+	ActionsView *_actionsView;
 	Dialogs *_dialogs;
 	M4Surface *_screen;
 	Inventory *_inventory;

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2009-11-26 10:59:46 UTC (rev 46151)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2009-11-26 11:48:43 UTC (rev 46152)
@@ -308,6 +308,7 @@
 		// removes this menu screen from being displayed
 		vm->_mouse->cursorOn();
 		vm->_viewManager->addView(vm->_scene);
+		vm->_viewManager->addView(vm->_actionsView);
 		vm->_scene->loadScene(101);
 
 		// **DEBUG** - set the default object

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2009-11-26 10:59:46 UTC (rev 46151)
+++ scummvm/trunk/engines/m4/scene.cpp	2009-11-26 11:48:43 UTC (rev 46152)
@@ -717,4 +717,171 @@
 	_selectedObject = objectNumber;
 }
 
+/*
+ * TODO: decide if this should be kept centralised like it is in the original, or separated for the different
+ * visual elements
+void Scene::getInterfaceObjectRect(int xv, int yv, Common::Rect &bounds) {
+	// TODO: Implement these later as proper fields of the interface when I understand them better
+	const int interfaceObjY = 0;
+	const int interfaceObjX = 0;
+
+	int16 height = 8, width = 0;
+	bounds.top = 0; bounds.left = 0;
+
+	// Handle X position and width
+	switch (xv) {
+	case 1:
+		bounds.left = ((yv / 5) << 3) + 3;
+		width = ((yv / 5) << 6) + 2;
+		break;
+
+	case 2:
+		if ((yv < interfaceObjX) || (yv > (interfaceObjX + 5))) return;
+		bounds.left = ((yv - interfaceObjX) << 3) + 3;
+		width = yv * 69 + 90;
+		break;
+
+	case 6:
+		bounds.left = (yv << 3) + 3;
+		width = yv * 318 + 2;
+		break;
+
+	case 7:
+		bounds.left = 0;
+		width = (yv == 4) ? 75 : 73;
+		break;
+
+	default:
+		bounds.left = (yv << 3) + 3;
+		width = yv * 80 + 240;
+		break;
+	}
+
+	// Handle Y position and height
+	if (xv ==  7) {
+		switch (yv) {
+		case 1:
+			bounds.top = 4;
+			height = 7;
+			break;
+		case 2:
+			bounds.top = 35;
+			height = 7;
+			break;
+		case 3:
+			bounds.top = 12;
+			height = 22;
+			break;
+		case 4:
+			bounds.top = interfaceObjY + 14;
+			height = 1;
+			break;
+		default:
+			break;
+		}
+	}
+
+	// Set the right and bottom bounds based on the specified size
+	bounds.right = bounds.left + width;
+	bounds.bottom = bounds.top + height;
+}
+*/
+
+/**
+ *--------------------------------------------------------------------------
+ * Base class for interface elements
+ *
+ *--------------------------------------------------------------------------
+ */
+
+InterfaceElement::InterfaceElement(M4Engine *vm, const Common::Rect &viewBounds, bool transparent):
+					View(vm, viewBounds, transparent) {
+}
+
+void InterfaceElement::setFontMode(FontMode newMode) {
+	switch (newMode) {
+	case MODE_0:
+		_vm->_font->setColors(4, 4, 0xff);
+		break;
+	case MODE_1:
+		//_vm->_font->setColors(5, 5, 0xff);
+		_vm->_font->setColors(0xff, 0xff, 0xff);
+		break;
+	case MODE_2:
+		_vm->_font->setColors(6, 6, 0xff);
+		break;
+	}
+}
+
+/**
+ *--------------------------------------------------------------------------
+ * ActionsView handles the display of the actions/verb list
+ *
+ *--------------------------------------------------------------------------
+ */
+
+ActionsView::ActionsView(M4Engine *vm): InterfaceElement(vm, Common::Rect(0, MADS_SURFACE_HEIGHT, 70, 
+														 vm->_screen->height())) {
+	_screenType = VIEWID_INTERFACE;
+	_highlightedAction = 0;
+}
+
+void ActionsView::getActionRect(int actionId, Common::Rect &bounds) {
+	int idx = actionId - kVerbLook;
+
+	bounds.left = (idx / 5) * 32 + 2;
+	bounds.top = (idx % 5) * 8 + MADS_SURFACE_HEIGHT + 3;
+	bounds.right = ((idx / 5) + 1) * 32 + 3;
+	bounds.bottom = ((idx % 5) + 1) * 8 + MADS_SURFACE_HEIGHT + 4;
+}
+
+void ActionsView::onRefresh(RectList *rects, M4Surface *destSurface) {
+	_vm->_font->setFont(FONT_INTERFACE_MADS);
+
+	int actionId = kVerbLook;
+	for (int x = 0; x < 2; ++x) {
+		for (int y = 0; y < 5; ++y, ++actionId) {
+			// Get the bounds for the next item
+			Common::Rect r;
+			getActionRect(actionId, r);
+
+			// Determine the font colour depending on whether an item is selected
+			setFontMode((_highlightedAction == actionId) ? MODE_1 : MODE_0);
+
+			// Get the verb action and capitalise it
+			const char *verbStr = _vm->_globals->getVocab(actionId);
+			char buffer[20];
+			strcpy(buffer, verbStr);
+			if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
+
+			// Display the verb
+			_vm->_font->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
+		}
+	}
+}
+
+bool ActionsView::onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents) {
+	if (eventType == MEVENT_MOVE) {
+		// If the cursor isn't in "wait mode", reset it back to the normal cursor
+		if (_vm->_mouse->getCursorNum() != CURSOR_WAIT)
+			_vm->_mouse->setCursorNum(CURSOR_ARROW);
+
+		// Check if any of the actions are currently highlighted
+		_highlightedAction = 0;
+		for (int i = kVerbLook; i <= kVerbThrow; ++i) {
+			Common::Rect r;
+			getActionRect(i, r);
+
+			if (r.contains(x, y)) {
+				_highlightedAction = i;
+				break;
+			}
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2009-11-26 10:59:46 UTC (rev 46151)
+++ scummvm/trunk/engines/m4/scene.h	2009-11-26 11:48:43 UTC (rev 46152)
@@ -127,6 +127,29 @@
 	void nextCommonCursor();
 };
 
+enum FontMode {MODE_0, MODE_1, MODE_2};
+
+class InterfaceElement: public View {
+protected:
+	void setFontMode(FontMode newMode);
+public:
+	InterfaceElement(M4Engine *vm, const Common::Rect &viewBounds, bool transparent = true);
+	~InterfaceElement() {};
+};
+
+class ActionsView: public InterfaceElement {
+private:
+	int _highlightedAction;
+
+	void getActionRect(int actionId, Common::Rect &bounds);
+public:
+	ActionsView(M4Engine *vm);
+	~ActionsView() {};
+
+	void onRefresh(RectList *rects, M4Surface *destSurface);
+	bool onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents);
+};
+
 } // End of namespace M4
 
 #endif


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

Revision: 46230
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46230&view=rev
Author:   dreammaster
Date:     2009-12-01 10:47:39 +0000 (Tue, 01 Dec 2009)

Log Message:
-----------
Corrected the palette colours for the interface elements

Modified Paths:
--------------
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2009-12-01 10:26:46 UTC (rev 46229)
+++ scummvm/trunk/engines/m4/scene.cpp	2009-12-01 10:47:39 UTC (rev 46230)
@@ -114,6 +114,12 @@
 		_backgroundSurface->loadBackground(sceneNumber);
 		_palData = NULL;
 	} else {
+		// Set system palette entries
+		_vm->_palette->blockRange(0, 7);
+		RGB8 sysColors[3] = { {0x1f<<2, 0x2d<<2, 0x31<<2, 0}, {0x24<<2, 0x37<<2, 0x3a<<2, 0}, 
+			{0x00<<2, 0x10<<2, 0x16<<2, 0}};
+		_vm->_palette->setPalette(&sysColors[0], 4, 3);
+
 		_backgroundSurface->loadBackground(sceneNumber, &_palData);
 		_vm->_palette->addRange(_palData);
 		_backgroundSurface->translate(_palData);
@@ -800,14 +806,13 @@
 
 void InterfaceElement::setFontMode(FontMode newMode) {
 	switch (newMode) {
-	case MODE_0:
+	case ITEM_NORMAL:
 		_vm->_font->setColors(4, 4, 0xff);
 		break;
-	case MODE_1:
-		//_vm->_font->setColors(5, 5, 0xff);
-		_vm->_font->setColors(0xff, 0xff, 0xff);
+	case ITEM_HIGHLIGHTED:
+		_vm->_font->setColors(5, 5, 0xff);
 		break;
-	case MODE_2:
+	case ITEM_SELECTED:
 		_vm->_font->setColors(6, 6, 0xff);
 		break;
 	}
@@ -845,8 +850,10 @@
 			Common::Rect r;
 			getActionRect(actionId, r);
 
-			// Determine the font colour depending on whether an item is selected
-			setFontMode((_highlightedAction == actionId) ? MODE_1 : MODE_0);
+			// Determine the font colour depending on whether an item is selected. Note that the 'Look' item
+			// is always 'selected', even when another action is selected
+			setFontMode((_highlightedAction == actionId) ? ITEM_HIGHLIGHTED : 
+				((actionId == kVerbLook) ? ITEM_SELECTED : ITEM_NORMAL));
 
 			// Get the verb action and capitalise it
 			const char *verbStr = _vm->_globals->getVocab(actionId);
@@ -862,10 +869,13 @@
 
 bool ActionsView::onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents) {
 	if (eventType == MEVENT_MOVE) {
-		// If the cursor isn't in "wait mode", reset it back to the normal cursor
-		if (_vm->_mouse->getCursorNum() != CURSOR_WAIT)
-			_vm->_mouse->setCursorNum(CURSOR_ARROW);
+		// If the cursor isn't in "wait mode", don't do any processing
+		if (_vm->_mouse->getCursorNum() == CURSOR_WAIT)
+			return true;
 
+		// Ensure the cursor is the standard arrow
+		_vm->_mouse->setCursorNum(CURSOR_ARROW);
+
 		// Check if any of the actions are currently highlighted
 		_highlightedAction = 0;
 		for (int i = kVerbLook; i <= kVerbThrow; ++i) {

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2009-12-01 10:26:46 UTC (rev 46229)
+++ scummvm/trunk/engines/m4/scene.h	2009-12-01 10:47:39 UTC (rev 46230)
@@ -127,7 +127,7 @@
 	void nextCommonCursor();
 };
 
-enum FontMode {MODE_0, MODE_1, MODE_2};
+enum FontMode {ITEM_NORMAL, ITEM_HIGHLIGHTED, ITEM_SELECTED};
 
 class InterfaceElement: public View {
 protected:


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

Revision: 46262
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46262&view=rev
Author:   dreammaster
Date:     2009-12-05 05:44:46 +0000 (Sat, 05 Dec 2009)

Log Message:
-----------
Expanded the actions view into a full user interface view, and added support for highlighting of user interface elements

Modified Paths:
--------------
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/m4.h
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h
    scummvm/trunk/engines/m4/viewmgr.cpp
    scummvm/trunk/engines/m4/viewmgr.h

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2009-12-04 20:03:53 UTC (rev 46261)
+++ scummvm/trunk/engines/m4/globals.h	2009-12-05 05:44:46 UTC (rev 46262)
@@ -228,7 +228,7 @@
 
 	void loadMadsObjects();
 	uint32 getObjectsSize() { return _madsObjects.size(); }
-	const MadsObject *getObject(uint32 index) { return _madsObjects[index].get(); }
+	MadsObject *getObject(uint32 index) { return _madsObjects[index].get(); }
 };
 
 #define PLAYER_FIELD_LENGTH 40

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2009-12-04 20:03:53 UTC (rev 46261)
+++ scummvm/trunk/engines/m4/m4.cpp	2009-12-05 05:44:46 UTC (rev 46262)
@@ -182,7 +182,6 @@
 	}
 	_rails = new Rails();	// needs to be initialized before _scene
 	_scene = new Scene(this);
-	_actionsView = new ActionsView(this);
 	_dialogs = new Dialogs();
 	_viewManager = new ViewManager(this);
 	_inventory = new Inventory(this);
@@ -306,8 +305,7 @@
 			_scene->loadScene(106);		// a more interesting scene
 		}
 
-		_viewManager->addView(_scene);
-		_viewManager->addView(_actionsView);
+		_scene->show();
 
 		_font->setFont(FONT_MAIN_MADS);
 		_font->setColors(2, 1, 3);

Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h	2009-12-04 20:03:53 UTC (rev 46261)
+++ scummvm/trunk/engines/m4/m4.h	2009-12-05 05:44:46 UTC (rev 46262)
@@ -186,7 +186,6 @@
 	Font *_font;
 	Actor *_actor;
 	Scene *_scene;
-	ActionsView *_actionsView;
 	Dialogs *_dialogs;
 	M4Surface *_screen;
 	Inventory *_inventory;

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2009-12-04 20:03:53 UTC (rev 46261)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2009-12-05 05:44:46 UTC (rev 46262)
@@ -307,12 +307,8 @@
 		// Load a sample starting scene - note that, currently, calling loadScene automatically
 		// removes this menu screen from being displayed
 		vm->_mouse->cursorOn();
-		vm->_viewManager->addView(vm->_scene);
-		vm->_viewManager->addView(vm->_actionsView);
+		vm->_scene->show();
 		vm->_scene->loadScene(101);
-
-		// **DEBUG** - set the default object
-		vm->_scene->setSelectedObject(48);
 		return;
 
 	case SHOW_INTRO:

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2009-12-04 20:03:53 UTC (rev 46261)
+++ scummvm/trunk/engines/m4/scene.cpp	2009-12-05 05:44:46 UTC (rev 46262)
@@ -44,9 +44,8 @@
 	_sceneResources.props = new HotSpotList();
 	_backgroundSurface = new M4Surface();
 	_codeSurface = new M4Surface();
-	_madsInterfaceSurface = new M4Surface();
+	_madsInterfaceSurface = new MadsInterfaceView(vm);
 	_sceneSprites = NULL;
-	_objectSprites = NULL;
 	_palData = NULL;
 	_interfacePal = NULL;
 	_inverseColorTable = NULL;
@@ -65,12 +64,9 @@
 
 	delete _backgroundSurface;
 	delete _codeSurface;
-	delete _madsInterfaceSurface;
 
 	if (_sceneSprites)
 		delete _sceneSprites;
-	if (_objectSprites)
-		delete _objectSprites;
 
 	_vm->_palette->deleteAllRanges();
 
@@ -133,6 +129,8 @@
 			_vm->_palette->addRange(_interfacePal);
 			_madsInterfaceSurface->translate(_interfacePal);
 			_backgroundSurface->copyFrom(_madsInterfaceSurface, Common::Rect(0, 0, 320, 44), 0, 200 - 44);
+
+			_madsInterfaceSurface->initialise();
 		}
 	}
 
@@ -450,9 +448,10 @@
 
 }
 
-static const int FRAME_SPEED = 8;
-static const int INVENTORY_X = 160;
-static const int INVENTORY_Y = 159;
+void Scene::show() {
+	_vm->_viewManager->addView(this);
+	_vm->_viewManager->addView(_madsInterfaceSurface);
+}
 
 void Scene::update() {
 	// TODO: Needs a proper implementation
@@ -473,19 +472,6 @@
 		}
 
 		_madsInterfaceSurface->copyTo(this, 0, this->height() - _madsInterfaceSurface->height());
-
-		if (_objectSprites) {
-			// Display object sprite. Note that the frame number isn't used directly, because it would result
-			// in too fast an animation
-			M4Sprite *spr = _objectSprites->getFrame(_objectFrameNumber / FRAME_SPEED);
-			spr->copyTo(this, INVENTORY_X, INVENTORY_Y, 0);
-
-			if (!_vm->_globals->invObjectsStill) {
-				// If objetcs are to animated, move to the next frame
-				if (++_objectFrameNumber >= (_objectSprites->getCount() * FRAME_SPEED))
-					_objectFrameNumber = 0;
-			}
-		}
 	}
 }
 
@@ -698,31 +684,6 @@
 
 /*--------------------------------------------------------------------------*/
 
-void Scene::setSelectedObject(int objectNumber) {
-	VALIDATE_MADS;
-
-	// Load inventory resource
-	if (_objectSprites) {
-		_vm->_palette->deleteRange(_objectPalData);
-		delete _objectSprites;
-	}
-
-	char resName[80];
-	sprintf(resName, "*OB%.3dI.SS", objectNumber);
-
-	Common::SeekableReadStream *data = _vm->res()->get(resName);
-	_objectSprites = new SpriteAsset(_vm, data, data->size(), resName);
-	_vm->res()->toss(resName);
-
-	// Slot it into available palette space
-	_objectPalData = _objectSprites->getRgbList();
-	_vm->_palette->addRange(_objectPalData);
-	_objectSprites->translate(_objectPalData, true);
-
-	_objectFrameNumber = 0;
-	_selectedObject = objectNumber;
-}
-
 /*
  * TODO: decide if this should be kept centralised like it is in the original, or separated for the different
  * visual elements
@@ -795,16 +756,46 @@
 
 /**
  *--------------------------------------------------------------------------
- * Base class for interface elements
- *
+ * MadsInterfaceView handles the user interface section at the bottom of
+ * game screens in MADS games
  *--------------------------------------------------------------------------
  */
 
-InterfaceElement::InterfaceElement(M4Engine *vm, const Common::Rect &viewBounds, bool transparent):
-					View(vm, viewBounds, transparent) {
+MadsInterfaceView::MadsInterfaceView(M4Engine *vm): View(vm, Common::Rect(0, MADS_SURFACE_HEIGHT,
+														 vm->_screen->width(), vm->_screen->height())) {
+	_screenType = VIEWID_INTERFACE;
+	_highlightedElement = -1;
+	_topIndex = 0;
+	_selectedObject = -1;
+
+	_objectSprites = NULL;
+	_objectPalData = NULL;
+
+	/* Set up the rect list for screen elements */
+	// Actions
+	for (int i = 0; i < 10; ++i)
+		_screenObjects.addRect((i / 5) * 32 + 1, (i % 5) * 8 + MADS_SURFACE_HEIGHT + 2,
+			((i / 5) + 1) * 32 + 3, ((i % 5) + 1) * 8 + MADS_SURFACE_HEIGHT + 2);
+	
+	// Scroller elements (up arrow, scroller, down arrow)
+	_screenObjects.addRect(73, 160, 82, 167);
+	_screenObjects.addRect(73, 168, 82, 190);
+	_screenObjects.addRect(73, 191, 82, 198);
+
+	// Inventory object names
+	for (int i = 0; i < 5; ++i)
+		_screenObjects.addRect(89, 158 + i * 8, 160, 166 + i * 8);
+	
+	// Full rectangle area for all vocab actions
+	for (int i = 0; i < 5; ++i)
+		_screenObjects.addRect(239, 158 + i * 8, 320, 166 + i * 8);
 }
 
-void InterfaceElement::setFontMode(FontMode newMode) {
+MadsInterfaceView::~MadsInterfaceView() {
+	delete _objectSprites;
+}
+
+void MadsInterfaceView::setFontMode(InterfaceFontMode newMode) {
 	switch (newMode) {
 	case ITEM_NORMAL:
 		_vm->_font->setColors(4, 4, 0xff);
@@ -818,56 +809,160 @@
 	}
 }
 
-/**
- *--------------------------------------------------------------------------
- * ActionsView handles the display of the actions/verb list
- *
- *--------------------------------------------------------------------------
- */
+void MadsInterfaceView::initialise() {
+	// Build up the inventory list
+	_inventoryList.clear();
 
-ActionsView::ActionsView(M4Engine *vm): InterfaceElement(vm, Common::Rect(0, MADS_SURFACE_HEIGHT, 70, 
-														 vm->_screen->height())) {
-	_screenType = VIEWID_INTERFACE;
-	_highlightedAction = 0;
+	for (uint i = 0; i < _vm->_globals->getObjectsSize(); ++i) {
+		MadsObject *obj = _vm->_globals->getObject(i);
+		if (obj->roomNumber == PLAYER_INVENTORY)
+			_inventoryList.push_back(i);
+	}
+
+	// If the inventory has at least one object, select it
+	if (_inventoryList.size() > 0)
+		setSelectedObject(_inventoryList[0]);
 }
 
-void ActionsView::getActionRect(int actionId, Common::Rect &b) {
-	int idx = actionId - kVerbLook;
+void MadsInterfaceView::setSelectedObject(int objectNumber) {
+	char resName[80];
 
-	b.left = (idx / 5) * 32 + 2;
-	b.top = (idx % 5) * 8 + MADS_SURFACE_HEIGHT + 3;
-	b.right = ((idx / 5) + 1) * 32 + 3;
-	b.bottom = ((idx % 5) + 1) * 8 + MADS_SURFACE_HEIGHT + 4;
+	// Load inventory resource
+	if (_objectSprites) {
+		_vm->_palette->deleteRange(_objectPalData);
+		delete _objectSprites;
+	}
+
+	// Check to make sure the object is in the inventory, and also visible on-screen
+	int idx = 0;
+	while (idx < (int)_inventoryList.size()) {
+		if (_inventoryList[idx] == objectNumber) {
+			// Found the object
+			if (idx < _topIndex)
+				_topIndex = idx;
+			else if (idx >= (_topIndex + 5))
+				_topIndex = MAX(0, idx - 4);
+			break;
+		}
+		++idx;
+	}
+	if (idx == (int)_inventoryList.size()) {
+		// Object wasn't found, so return
+		_selectedObject = -1;
+		return;
+	}
+	
+	_selectedObject = objectNumber;
+	sprintf(resName, "*OB%.3dI.SS", objectNumber);
+
+	Common::SeekableReadStream *data = _vm->res()->get(resName);
+	_objectSprites = new SpriteAsset(_vm, data, data->size(), resName);
+	_vm->res()->toss(resName);
+
+	// Slot it into available palette space
+	_objectPalData = _objectSprites->getRgbList();
+	_vm->_palette->addRange(_objectPalData);
+	_objectSprites->translate(_objectPalData, true);
+
+	_objectFrameNumber = 0;
 }
 
-void ActionsView::onRefresh(RectList *rects, M4Surface *destSurface) {
+static const int FRAME_SPEED = 8;
+static const int INVENTORY_X = 160;
+static const int INVENTORY_Y = 159;
+
+
+void MadsInterfaceView::onRefresh(RectList *rects, M4Surface *destSurface) {
 	_vm->_font->setFont(FONT_INTERFACE_MADS);
+	char buffer[100];
 
-	int actionId = kVerbLook;
+	// Highlighting logic for action list
+	int actionIndex = 0;
 	for (int x = 0; x < 2; ++x) {
-		for (int y = 0; y < 5; ++y, ++actionId) {
-			// Get the bounds for the next item
-			Common::Rect r;
-			getActionRect(actionId, r);
+		for (int y = 0; y < 5; ++y, ++actionIndex) {
+			// Determine the font colour depending on whether an item is selected. Note that the first action,
+			// 'Look', is always 'selected', even when another action is clicked on
+			setFontMode((_highlightedElement == actionIndex) ? ITEM_HIGHLIGHTED : 
+				((actionIndex == 0) ? ITEM_SELECTED : ITEM_NORMAL));
 
-			// Determine the font colour depending on whether an item is selected. Note that the 'Look' item
-			// is always 'selected', even when another action is selected
-			setFontMode((_highlightedAction == actionId) ? ITEM_HIGHLIGHTED : 
-				((actionId == kVerbLook) ? ITEM_SELECTED : ITEM_NORMAL));
-
 			// Get the verb action and capitalise it
-			const char *verbStr = _vm->_globals->getVocab(actionId);
-			char buffer[20];
+			const char *verbStr = _vm->_globals->getVocab(kVerbLook + actionIndex);
 			strcpy(buffer, verbStr);
 			if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
 
 			// Display the verb
+			const Common::Rect r(_screenObjects[actionIndex]);
 			_vm->_font->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
 		}
 	}
+
+	// Check for highlighting of the scrollbar controls
+	if ((_highlightedElement == SCROLL_UP) || (_highlightedElement == SCROLL_SCROLLER) || (_highlightedElement == SCROLL_DOWN)) {
+		// Highlight the control's borders
+		const Common::Rect r(_screenObjects[_highlightedElement]);
+		destSurface->frameRect(r, 5);
+	}
+
+	// Draw the horizontal line in the scroller representing the current top selected 
+	const Common::Rect scroller(_screenObjects[SCROLL_SCROLLER]);
+	int yP = (_inventoryList.size() == 0) ? 0 : (scroller.height() - 4) * _topIndex / _inventoryList.size();
+	destSurface->setColor(4);
+	destSurface->hLine(scroller.left + 2, scroller.right - 3, scroller.top + 2 + yP);
+
+	// List inventory items
+	for (uint i = 0; i < 5; ++i) {
+		if ((_topIndex + i) >= _inventoryList.size())
+			break;
+
+		const char *descStr = _vm->_globals->getVocab(_vm->_globals->getObject(
+			_inventoryList[_topIndex + i])->descId);
+		strcpy(buffer, descStr);
+		if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
+
+		const Common::Rect r(_screenObjects[INVLIST_START + i]);
+	
+		// Set the highlighting of the inventory item
+		if (_highlightedElement == (int)(INVLIST_START + i)) setFontMode(ITEM_HIGHLIGHTED);
+		else if (_selectedObject == _inventoryList[_topIndex + i]) setFontMode(ITEM_SELECTED);
+		else setFontMode(ITEM_NORMAL);
+
+		// Write out it's description
+		_vm->_font->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
+	}
+
+	// Handle the display of any currently selected object
+	if (_objectSprites) {
+		// Display object sprite. Note that the frame number isn't used directly, because it would result
+		// in too fast an animation
+		M4Sprite *spr = _objectSprites->getFrame(_objectFrameNumber / FRAME_SPEED);
+		spr->copyTo(destSurface, INVENTORY_X, INVENTORY_Y, 0);
+
+		if (!_vm->_globals->invObjectsStill) {
+			// If objetcs are to animated, move to the next frame
+			if (++_objectFrameNumber >= (_objectSprites->getCount() * FRAME_SPEED))
+				_objectFrameNumber = 0;
+		}
+
+		// List the vocab actions for the currently selected object
+		MadsObject *obj = _vm->_globals->getObject(_selectedObject);
+		int yIndex = MIN(_highlightedElement - VOCAB_START, obj->vocabCount - 1);
+
+		for (int i = 0; i < obj->vocabCount; ++i) {
+			const Common::Rect r(_screenObjects[VOCAB_START + i]);
+
+			// Get the vocab description and capitalise it
+			const char *descStr = _vm->_globals->getVocab(obj->vocabList[i].vocabId);
+			strcpy(buffer, descStr);
+			if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
+		
+			// Set the highlighting and display the entry
+			setFontMode((i == yIndex) ? ITEM_HIGHLIGHTED : ITEM_NORMAL);
+			_vm->_font->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
+		}
+	}
 }
 
-bool ActionsView::onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents) {
+bool MadsInterfaceView::onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents) {
 	if (eventType == MEVENT_MOVE) {
 		// If the cursor isn't in "wait mode", don't do any processing
 		if (_vm->_mouse->getCursorNum() == CURSOR_WAIT)
@@ -876,18 +971,9 @@
 		// Ensure the cursor is the standard arrow
 		_vm->_mouse->setCursorNum(CURSOR_ARROW);
 
-		// Check if any of the actions are currently highlighted
-		_highlightedAction = 0;
-		for (int i = kVerbLook; i <= kVerbThrow; ++i) {
-			Common::Rect r;
-			getActionRect(i, r);
+		// Check if any interface element is currently highlighted
+		_highlightedElement = _screenObjects.find(Common::Point(x, y));
 
-			if (r.contains(x, y)) {
-				_highlightedAction = i;
-				break;
-			}
-		}
-
 		return true;
 	}
 

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2009-12-04 20:03:53 UTC (rev 46261)
+++ scummvm/trunk/engines/m4/scene.h	2009-12-05 05:44:46 UTC (rev 46262)
@@ -72,6 +72,8 @@
 	int32 railNodeCount;	// # of rails
 };
 
+class MadsInterfaceView;
+
 class Scene: public View {
 public:
 	Scene(M4Engine *vm);
@@ -79,6 +81,7 @@
 
 	// TODO: perhaps move playIntro() someplace else?
 	void playIntro();
+	void show();
 	void loadScene(int sceneNumber);
 	void loadSceneResources(int sceneNumber);
 	void loadSceneHotSpotsMads(int sceneNumber);
@@ -102,13 +105,11 @@
 	void onRefresh(RectList *rects, M4Surface *destSurface);
 	bool onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents);
 
-	void setSelectedObject(int objectNumber);
-
 private:
 	int _currentScene;
 	M4Surface *_backgroundSurface;
 	M4Surface *_codeSurface;
-	M4Surface *_madsInterfaceSurface;
+	MadsInterfaceView *_madsInterfaceSurface;
 	byte *_inverseColorTable;
 	RGBList *_palData;
 	RGBList *_interfacePal;
@@ -118,34 +119,35 @@
 	SpriteAsset *_walkerSprite;
 	char _statusText[100];
 
-	// Inventory related fields
-	int _selectedObject;
-	SpriteAsset *_objectSprites;
-	RGBList *_objectPalData;
-	int _objectFrameNumber;
-
 	void nextCommonCursor();
 };
 
-enum FontMode {ITEM_NORMAL, ITEM_HIGHLIGHTED, ITEM_SELECTED};
+enum InterfaceFontMode {ITEM_NORMAL, ITEM_HIGHLIGHTED, ITEM_SELECTED};
 
-class InterfaceElement: public View {
-protected:
-	void setFontMode(FontMode newMode);
-public:
-	InterfaceElement(M4Engine *vm, const Common::Rect &viewBounds, bool transparent = true);
-	~InterfaceElement() {};
-};
+enum InterfaceObjects {ACTIONS_START = 0, SCROLL_UP = 10, SCROLL_SCROLLER = 11, SCROLL_DOWN = 12,
+		INVLIST_START = 13, VOCAB_START = 18};
 
-class ActionsView: public InterfaceElement {
+class MadsInterfaceView: public View {
 private:
-	int _highlightedAction;
+	Common::Array<int> _inventoryList;
+	RectList _screenObjects;
+	int _highlightedElement;
+	int _topIndex;
+	
+	// Object display fields
+	int _selectedObject;
+	SpriteAsset *_objectSprites;
+	RGBList *_objectPalData;
+	int _objectFrameNumber;
 
-	void getActionRect(int actionId, Common::Rect &bounds);
+	void setFontMode(InterfaceFontMode newMode);
 public:
-	ActionsView(M4Engine *vm);
-	~ActionsView() {};
+	MadsInterfaceView(M4Engine *vm);
+	~MadsInterfaceView();
 
+	void initialise();
+	void setSelectedObject(int objectNumber);
+
 	void onRefresh(RectList *rects, M4Surface *destSurface);
 	bool onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents);
 };

Modified: scummvm/trunk/engines/m4/viewmgr.cpp
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.cpp	2009-12-04 20:03:53 UTC (rev 46261)
+++ scummvm/trunk/engines/m4/viewmgr.cpp	2009-12-05 05:44:46 UTC (rev 46262)
@@ -58,6 +58,14 @@
 	push_back(rect);
 }
 
+int RectList::find(const Common::Point &pt) {
+	for (int idx = 0; idx < size(); ++idx) {
+		if (this->operator [](idx).contains(pt.x, pt.y))
+			return idx;
+	}
+	return -1;	
+}
+
 //--------------------------------------------------------------------------
 
 HotkeyList::HotkeyList(View *owner) {

Modified: scummvm/trunk/engines/m4/viewmgr.h
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.h	2009-12-04 20:03:53 UTC (rev 46261)
+++ scummvm/trunk/engines/m4/viewmgr.h	2009-12-05 05:44:46 UTC (rev 46262)
@@ -84,6 +84,7 @@
 	void addRect(const Common::Rect &rect);
 
 //	Common::Rect& operator [](int idx) { return _rects[idx]; }
+	int find(const Common::Point &pt);
 };
 
 struct Hotkey {


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

Revision: 46266
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46266&view=rev
Author:   dreammaster
Date:     2009-12-05 07:46:41 +0000 (Sat, 05 Dec 2009)

Log Message:
-----------
Implemented support for the inventory list scrollbar and directly selecting an object

Modified Paths:
--------------
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2009-12-05 06:14:04 UTC (rev 46265)
+++ scummvm/trunk/engines/m4/scene.cpp	2009-12-05 07:46:41 UTC (rev 46266)
@@ -36,6 +36,12 @@
 
 namespace M4 {
 
+static const int INV_ANIM_FRAME_SPEED = 8;
+static const int INVENTORY_X = 160;
+static const int INVENTORY_Y = 159;
+static const int SCROLLER_DELAY = 200;
+
+
 Scene::Scene(M4Engine *vm): View(vm, Common::Rect(0, 0, vm->_screen->width(), vm->_screen->height())) {
 	_screenType = VIEWID_SCENE;
 
@@ -834,23 +840,18 @@
 	}
 
 	// Check to make sure the object is in the inventory, and also visible on-screen
-	int idx = 0;
-	while (idx < (int)_inventoryList.size()) {
-		if (_inventoryList[idx] == objectNumber) {
-			// Found the object
-			if (idx < _topIndex)
-				_topIndex = idx;
-			else if (idx >= (_topIndex + 5))
-				_topIndex = MAX(0, idx - 4);
-			break;
-		}
-		++idx;
-	}
-	if (idx == (int)_inventoryList.size()) {
+	int idx = _inventoryList.indexOf(objectNumber);
+	if (idx == -1) {
 		// Object wasn't found, so return
 		_selectedObject = -1;
 		return;
 	}
+
+	// Found the object
+	if (idx < _topIndex)
+		_topIndex = idx;
+	else if (idx >= (_topIndex + 5))
+		_topIndex = MAX(0, idx - 4);
 	
 	_selectedObject = objectNumber;
 	sprintf(resName, "*OB%.3dI.SS", objectNumber);
@@ -867,10 +868,14 @@
 	_objectFrameNumber = 0;
 }
 
-static const int FRAME_SPEED = 8;
-static const int INVENTORY_X = 160;
-static const int INVENTORY_Y = 159;
+void MadsInterfaceView::addObjectToInventory(int objectNumber) {
+	if (_inventoryList.indexOf(objectNumber) == -1) {
+		_vm->_globals->getObject(objectNumber)->roomNumber = PLAYER_INVENTORY;
+		_inventoryList.push_back(objectNumber);
+	}
 
+	setSelectedObject(objectNumber);
+}
 
 void MadsInterfaceView::onRefresh(RectList *rects, M4Surface *destSurface) {
 	_vm->_font->setFont(FONT_INTERFACE_MADS);
@@ -905,7 +910,7 @@
 
 	// Draw the horizontal line in the scroller representing the current top selected 
 	const Common::Rect scroller(_screenObjects[SCROLL_SCROLLER]);
-	int yP = (_inventoryList.size() == 0) ? 0 : (scroller.height() - 4) * _topIndex / _inventoryList.size();
+	int yP = (_inventoryList.size() < 2) ? 0 : (scroller.height() - 5) * _topIndex / (_inventoryList.size() - 1);
 	destSurface->setColor(4);
 	destSurface->hLine(scroller.left + 2, scroller.right - 3, scroller.top + 2 + yP);
 
@@ -934,12 +939,12 @@
 	if (_objectSprites) {
 		// Display object sprite. Note that the frame number isn't used directly, because it would result
 		// in too fast an animation
-		M4Sprite *spr = _objectSprites->getFrame(_objectFrameNumber / FRAME_SPEED);
+		M4Sprite *spr = _objectSprites->getFrame(_objectFrameNumber / INV_ANIM_FRAME_SPEED);
 		spr->copyTo(destSurface, INVENTORY_X, INVENTORY_Y, 0);
 
 		if (!_vm->_globals->invObjectsStill) {
 			// If objetcs are to animated, move to the next frame
-			if (++_objectFrameNumber >= (_objectSprites->getCount() * FRAME_SPEED))
+			if (++_objectFrameNumber >= (_objectSprites->getCount() * INV_ANIM_FRAME_SPEED))
 				_objectFrameNumber = 0;
 		}
 
@@ -963,7 +968,13 @@
 }
 
 bool MadsInterfaceView::onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents) {
-	if (eventType == MEVENT_MOVE) {
+	// If the mouse isn't being held down, then reset the repeated scroll timer
+	if (eventType != MEVENT_LEFT_HOLD)
+		_nextScrollerTicks = 0;
+
+	// Handle various event types
+	switch (eventType) {
+	case MEVENT_MOVE:
 		// If the cursor isn't in "wait mode", don't do any processing
 		if (_vm->_mouse->getCursorNum() == CURSOR_WAIT)
 			return true;
@@ -975,6 +986,51 @@
 		_highlightedElement = _screenObjects.find(Common::Point(x, y));
 
 		return true;
+	
+	case MEVENT_LEFT_CLICK:
+		// Left mouse click
+		// Check if an inventory object was selected
+		if ((_highlightedElement >= INVLIST_START) && (_highlightedElement < (INVLIST_START + 5))) {
+			// Ensure there is an inventory item listed in that cell
+			uint idx = _highlightedElement - INVLIST_START;
+			if ((_topIndex + idx) < _inventoryList.size()) {
+				// Set the selected object
+				setSelectedObject(_inventoryList[_topIndex + idx]);
+			}
+			return true;
+		}
+
+		return true;
+
+	case MEVENT_LEFT_HOLD:
+		// Left mouse hold
+		// Handle the scroller - the up/down buttons allow for multiple actions whilst the mouse is held down
+		if ((_highlightedElement == SCROLL_UP) || (_highlightedElement == SCROLL_DOWN)) {
+			if ((_nextScrollerTicks == 0) || (g_system->getMillis() >= _nextScrollerTicks)) {
+				// Handle scroll up/down action
+				_nextScrollerTicks = g_system->getMillis() + SCROLLER_DELAY;
+
+				if ((_highlightedElement == SCROLL_UP) && (_topIndex > 0))
+					--_topIndex;
+				if ((_highlightedElement == SCROLL_DOWN) && (_topIndex < (int)(_inventoryList.size() - 1)))
+					++_topIndex;
+			}
+		}
+		return true;
+
+	case MEVENT_LEFT_DRAG:
+		// Left mouse drag
+		// Handle the the the scroller area that can be dragged to adjust the top displayed index
+		if (_highlightedElement == SCROLL_SCROLLER) {
+			// Calculate the new top index based on the Y position
+			const Common::Rect r(_screenObjects[SCROLL_SCROLLER]);
+			_topIndex = CLIP((int)(_inventoryList.size() - 1) * (y - r.top - 2) / (r.height() - 5),
+				0, (int)_inventoryList.size() - 1);
+		}
+		return true;
+
+	default:
+		break;
 	}
 
 	return false;

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2009-12-05 06:14:04 UTC (rev 46265)
+++ scummvm/trunk/engines/m4/scene.h	2009-12-05 07:46:41 UTC (rev 46266)
@@ -98,6 +98,7 @@
 	SceneResources getSceneResources() { return _sceneResources; }
 	M4Surface *getBackgroundSurface() const { return _backgroundSurface; }
 	byte *getInverseColorTable() const { return _inverseColorTable; }
+	MadsInterfaceView *getMadsInterface() { return _madsInterfaceSurface; }
 	void update();
 	void setMADSStatusText(const char *text) { strcpy(_statusText, text); }
 	void showMADSV2TextBox(char *text, int x, int y, char *faceName);
@@ -127,12 +128,23 @@
 enum InterfaceObjects {ACTIONS_START = 0, SCROLL_UP = 10, SCROLL_SCROLLER = 11, SCROLL_DOWN = 12,
 		INVLIST_START = 13, VOCAB_START = 18};
 
+class IntegerList: public Common::Array<int> {
+public:
+	int indexOf(int v) {
+		for (uint i = 0; i < size(); ++i)
+			if (operator [](i) == v) 
+				return i;
+		return -1;
+	}
+};
+
 class MadsInterfaceView: public View {
 private:
-	Common::Array<int> _inventoryList;
+	IntegerList _inventoryList;
 	RectList _screenObjects;
 	int _highlightedElement;
 	int _topIndex;
+	uint32 _nextScrollerTicks;
 	
 	// Object display fields
 	int _selectedObject;
@@ -147,6 +159,7 @@
 
 	void initialise();
 	void setSelectedObject(int objectNumber);
+	void addObjectToInventory(int objectNumber);
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
 	bool onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents);


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

Revision: 46268
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46268&view=rev
Author:   dreammaster
Date:     2009-12-05 11:32:19 +0000 (Sat, 05 Dec 2009)

Log Message:
-----------
Hooked up the actions list and object-specific actions to change the status text

Modified Paths:
--------------
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2009-12-05 07:47:01 UTC (rev 46267)
+++ scummvm/trunk/engines/m4/scene.cpp	2009-12-05 11:32:19 UTC (rev 46268)
@@ -57,6 +57,7 @@
 	_inverseColorTable = NULL;
 	strcpy(_statusText, "");
 	_vm->_rails->setCodeSurface(_codeSurface);
+	_currentAction = kVerbNone;
 }
 
 Scene::~Scene() {
@@ -393,12 +394,14 @@
 		// This is the "easy" interface, which updates the status text when the mouse is moved
 		// TODO: toggle this code for easy/normal interface mode
 		char statusText[50];
-		if (currentHotSpot->getVerbID() != 0) {
-			sprintf(statusText, "%s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab());
-		} else {
-			sprintf(statusText, "%s %s\n", _vm->_globals->getVocab(kVerbWalkTo), currentHotSpot->getVocab());
-		}
+		int verbId = _currentAction;
+		if (verbId == kVerbNone)
+			verbId = currentHotSpot->getVerbID();
+		if (verbId == kVerbNone)
+			verbId = kVerbWalkTo;
 
+		sprintf(statusText, "%s %s\n", _vm->_globals->getVocab(verbId), currentHotSpot->getVocab());
+
 		statusText[0] = toupper(statusText[0]);	// capitalize first letter
 		setMADSStatusText(statusText);
 	} else {
@@ -688,80 +691,29 @@
 	boxSprites->getFrame(bottomRight)->copyTo(_backgroundSurface, curX, curY + 1);
 }
 
-/*--------------------------------------------------------------------------*/
+void Scene::setAction(int action, int objectId) {
+	VALIDATE_MADS;
+	char statusText[50];
 
-/*
- * TODO: decide if this should be kept centralised like it is in the original, or separated for the different
- * visual elements
-void Scene::getInterfaceObjectRect(int xv, int yv, Common::Rect &bounds) {
-	// TODO: Implement these later as proper fields of the interface when I understand them better
-	const int interfaceObjY = 0;
-	const int interfaceObjX = 0;
+	// TODO: Actually executing actions directly for objects. Also, some object actions are special in that
+	// a second object can be selected, as in 'use gun to shoot person', with requires a target
 
-	int16 height = 8, width = 0;
-	bounds.top = 0; bounds.left = 0;
-
-	// Handle X position and width
-	switch (xv) {
-	case 1:
-		bounds.left = ((yv / 5) << 3) + 3;
-		width = ((yv / 5) << 6) + 2;
-		break;
-
-	case 2:
-		if ((yv < interfaceObjX) || (yv > (interfaceObjX + 5))) return;
-		bounds.left = ((yv - interfaceObjX) << 3) + 3;
-		width = yv * 69 + 90;
-		break;
-
-	case 6:
-		bounds.left = (yv << 3) + 3;
-		width = yv * 318 + 2;
-		break;
-
-	case 7:
-		bounds.left = 0;
-		width = (yv == 4) ? 75 : 73;
-		break;
-
-	default:
-		bounds.left = (yv << 3) + 3;
-		width = yv * 80 + 240;
-		break;
+	// Set up the new action
+	strcpy(statusText, _vm->_globals->getVocab(action));
+	statusText[0] = toupper(statusText[0]);	// capitalize first letter
+	
+	if (objectId != -1) {
+		MadsObject *obj = _vm->_globals->getObject(objectId);
+		sprintf(statusText + strlen(statusText), " %s", _vm->_globals->getVocab(obj->descId));
+	} else {
+		_currentAction = action;
 	}
 
-	// Handle Y position and height
-	if (xv ==  7) {
-		switch (yv) {
-		case 1:
-			bounds.top = 4;
-			height = 7;
-			break;
-		case 2:
-			bounds.top = 35;
-			height = 7;
-			break;
-		case 3:
-			bounds.top = 12;
-			height = 22;
-			break;
-		case 4:
-			bounds.top = interfaceObjY + 14;
-			height = 1;
-			break;
-		default:
-			break;
-		}
-	}
-
-	// Set the right and bottom bounds based on the specified size
-	bounds.right = bounds.left + width;
-	bounds.bottom = bounds.top + height;
+	setMADSStatusText(statusText);
 }
-*/
 
-/**
- *--------------------------------------------------------------------------
+
+/*--------------------------------------------------------------------------
  * MadsInterfaceView handles the user interface section at the bottom of
  * game screens in MADS games
  *--------------------------------------------------------------------------
@@ -997,7 +949,15 @@
 				// Set the selected object
 				setSelectedObject(_inventoryList[_topIndex + idx]);
 			}
-			return true;
+		} else if ((_highlightedElement >= ACTIONS_START) && (_highlightedElement < (ACTIONS_START + 10))) {
+			// A standard action was selected
+			_vm->_scene->setAction(kVerbLook + (_highlightedElement - ACTIONS_START));
+		} else if ((_highlightedElement >= VOCAB_START) && (_highlightedElement < (VOCAB_START + 5))) {
+			// A vocab action was selected
+			MadsObject *obj = _vm->_globals->getObject(_selectedObject);
+			int vocabIndex = MIN(_highlightedElement - VOCAB_START, obj->vocabCount - 1);
+			if (vocabIndex >= 0)
+				_vm->_scene->setAction(obj->vocabList[vocabIndex].vocabId, _selectedObject);
 		}
 
 		return true;

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2009-12-05 07:47:01 UTC (rev 46267)
+++ scummvm/trunk/engines/m4/scene.h	2009-12-05 11:32:19 UTC (rev 46268)
@@ -44,6 +44,7 @@
 #define MADS_SURFACE_HEIGHT 156
 
 enum MADSVerbs {
+	kVerbNone   = 0,
 	kVerbLook	= 3,
 	kVerbTake	= 4,
 	kVerbPush	= 5,
@@ -99,6 +100,7 @@
 	M4Surface *getBackgroundSurface() const { return _backgroundSurface; }
 	byte *getInverseColorTable() const { return _inverseColorTable; }
 	MadsInterfaceView *getMadsInterface() { return _madsInterfaceSurface; }
+	void setAction(int action, int objectId = -1);
 	void update();
 	void setMADSStatusText(const char *text) { strcpy(_statusText, text); }
 	void showMADSV2TextBox(char *text, int x, int y, char *faceName);
@@ -118,6 +120,7 @@
 	HotSpotList _sceneHotspots;
 	SpriteAsset *_sceneSprites;
 	SpriteAsset *_walkerSprite;
+	int _currentAction;
 	char _statusText[100];
 
 	void nextCommonCursor();


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

Revision: 46279
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46279&view=rev
Author:   fingolfin
Date:     2009-12-07 18:20:20 +0000 (Mon, 07 Dec 2009)

Log Message:
-----------
M4: Rename M4Surface::getData() to getBasePtr() for consistency

Modified Paths:
--------------
    scummvm/trunk/engines/m4/assets.cpp
    scummvm/trunk/engines/m4/events.cpp
    scummvm/trunk/engines/m4/graphics.cpp
    scummvm/trunk/engines/m4/graphics.h
    scummvm/trunk/engines/m4/sprite.cpp

Modified: scummvm/trunk/engines/m4/assets.cpp
===================================================================
--- scummvm/trunk/engines/m4/assets.cpp	2009-12-07 16:21:33 UTC (rev 46278)
+++ scummvm/trunk/engines/m4/assets.cpp	2009-12-07 18:20:20 UTC (rev 46279)
@@ -158,7 +158,7 @@
 			char fn[512];
 			sprintf(fn, "%04d.raw", curFrame);
 			FILE *h = fopen(fn, "wb");
-			fwrite((byte*)frame.frame->getData(), frame.w * frame.h, 1, h);
+			fwrite((byte*)frame.frame->getBasePtr(), frame.w * frame.h, 1, h);
 			fclose(h);
 #endif
 		}

Modified: scummvm/trunk/engines/m4/events.cpp
===================================================================
--- scummvm/trunk/engines/m4/events.cpp	2009-12-07 16:21:33 UTC (rev 46278)
+++ scummvm/trunk/engines/m4/events.cpp	2009-12-07 18:20:20 UTC (rev 46279)
@@ -240,7 +240,7 @@
 	_cursor = _cursorSprites->getFrame(cursorIndex);
 
 	// Set the cursor to the sprite
-	CursorMan.replaceCursor((const byte *)_cursor->getData(), _cursor->w, _cursor->h, _cursor->xOffset, _cursor->yOffset, 0);
+	CursorMan.replaceCursor((const byte *)_cursor->getBasePtr(), _cursor->w, _cursor->h, _cursor->xOffset, _cursor->yOffset, 0);
 
 	return true;
 }

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2009-12-07 16:21:33 UTC (rev 46278)
+++ scummvm/trunk/engines/m4/graphics.cpp	2009-12-07 18:20:20 UTC (rev 46279)
@@ -216,7 +216,7 @@
 		return;
 	int heightAmt = scaledHeight;
 
-	byte *src = info.sprite->getData();
+	byte *src = info.sprite->getBasePtr();
 	byte *dst = getBasePtr(x - info.hotX - clipX, y - info.hotY - clipY);
 
 	int status = kStatusSkip;
@@ -309,19 +309,11 @@
 
 // Surface methods
 
-byte *M4Surface::getData() {
-	return (byte *)pixels;
-}
-
-byte *M4Surface::getBasePtr(int x, int y) {
-	return (byte *)Graphics::Surface::getBasePtr(x, y);
-}
-
 void M4Surface::freeData() {
 }
 
 void M4Surface::clear() {
-	Common::set_to((byte *) pixels, (byte *) pixels + w * h, _vm->_palette->BLACK);
+	Common::set_to((byte *)pixels, (byte *)pixels + w * h, _vm->_palette->BLACK);
 }
 
 void M4Surface::frameRect(const Common::Rect &r, uint8 color) {
@@ -357,7 +349,7 @@
 
 	// Copy the specified area
 
-	byte *data = src->getData();
+	byte *data = src->getBasePtr();
 	byte *srcPtr = data + (src->width() * copyRect.top + copyRect.left);
 	byte *destPtr = (byte *)pixels + (destY * width()) + destX;
 
@@ -855,7 +847,7 @@
 
 	// Remap all pixels into the #32-63 range
 
-	tempP = _vm->_scene->getData();
+	tempP = _vm->_scene->getBasePtr();
 	for (int pixelCtr = 0; pixelCtr < _vm->_scene->width() * _vm->_scene->height();
 			++pixelCtr, ++tempP) {
 		// If pixel is in #32-63 range already, remap to higher palette entries

Modified: scummvm/trunk/engines/m4/graphics.h
===================================================================
--- scummvm/trunk/engines/m4/graphics.h	2009-12-07 16:21:33 UTC (rev 46278)
+++ scummvm/trunk/engines/m4/graphics.h	2009-12-07 18:20:20 UTC (rev 46279)
@@ -125,8 +125,15 @@
 	int width() { return w; }
 	int height() { return h; }
 	void setSize(int sizeX, int sizeY) { create(sizeX, sizeY, 1); }
-	byte *getData();
-	byte *getBasePtr(int x, int y);
+	inline byte *getBasePtr() {
+		return (byte *)pixels;
+	}
+	inline byte *getBasePtr(int x, int y) {
+		return (byte *)Graphics::Surface::getBasePtr(x, y);
+	}
+	inline const byte *getBasePtr(int x, int y) const {
+		return (const byte *)Graphics::Surface::getBasePtr(x, y);
+	}
 	void freeData();
 	void clear();
 	void frameRect(const Common::Rect &r, uint8 color);

Modified: scummvm/trunk/engines/m4/sprite.cpp
===================================================================
--- scummvm/trunk/engines/m4/sprite.cpp	2009-12-07 16:21:33 UTC (rev 46278)
+++ scummvm/trunk/engines/m4/sprite.cpp	2009-12-07 18:20:20 UTC (rev 46279)
@@ -47,7 +47,7 @@
 			loadRle(source);
 		} else {
 			// Raw sprite data, load directly
-			byte *dst = getData();
+			byte *dst = getBasePtr();
 			source->read(dst, widthVal * heightVal);
 		}
 	} else {
@@ -60,7 +60,7 @@
 }
 
 void M4Sprite::loadRle(Common::SeekableReadStream* rleData) {
-	byte *dst = getData();
+	byte *dst = getBasePtr();
 	while (1) {
 		byte len = rleData->readByte();
 		if (len == 0) {
@@ -124,8 +124,8 @@
 	byte *outp, *lineStart;
 	bool newLine = false;
 
-	outp = getData();
-	lineStart = getData();
+	outp = getBasePtr();
+	lineStart = getBasePtr();
 
 	while (1) {
 		byte cmd1, cmd2, count, pixel;


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

Revision: 46280
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46280&view=rev
Author:   fingolfin
Date:     2009-12-07 18:22:18 +0000 (Mon, 07 Dec 2009)

Log Message:
-----------
M4: Make M4Surface member w, h, pixels protected; some cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/m4/actor.cpp
    scummvm/trunk/engines/m4/animation.cpp
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/events.cpp
    scummvm/trunk/engines/m4/graphics.h
    scummvm/trunk/engines/m4/m4_menus.cpp
    scummvm/trunk/engines/m4/mads_anim.cpp
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/rails.cpp
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/viewmgr.cpp
    scummvm/trunk/engines/m4/ws_sequence.cpp

Modified: scummvm/trunk/engines/m4/actor.cpp
===================================================================
--- scummvm/trunk/engines/m4/actor.cpp	2009-12-07 18:20:20 UTC (rev 46279)
+++ scummvm/trunk/engines/m4/actor.cpp	2009-12-07 18:22:18 UTC (rev 46280)
@@ -44,8 +44,8 @@
 	unloadWalkers();
 }
 
-int Actor::getWalkerWidth() { return _walkerSprites[kFacingSouth]->getFrame(0)->w; }
-int Actor::getWalkerHeight() { return _walkerSprites[kFacingSouth]->getFrame(0)->h; }
+int Actor::getWalkerWidth() { return _walkerSprites[kFacingSouth]->getFrame(0)->width(); }
+int Actor::getWalkerHeight() { return _walkerSprites[kFacingSouth]->getFrame(0)->height(); }
 
 void Actor::placeWalkerSpriteAt(int spriteNum, int x, int y) {
 	if (_direction < 1 || _direction > 9) {
@@ -55,8 +55,8 @@
 	SpriteInfo info;
 	info.sprite = _walkerSprites[_direction]->getFrame(spriteNum);
 	info.hotX = info.hotY = 0;
-	info.width = info.sprite->w;
-	info.height = info.sprite->h;
+	info.width = info.sprite->width();
+	info.height = info.sprite->height();
 	info.scaleX = info.scaleY = _scaling;
 	info.palette = _walkerSprites[_direction]->getPalette();
 	info.inverseColorTable = _vm->_scene->getInverseColorTable();

Modified: scummvm/trunk/engines/m4/animation.cpp
===================================================================
--- scummvm/trunk/engines/m4/animation.cpp	2009-12-07 18:20:20 UTC (rev 46279)
+++ scummvm/trunk/engines/m4/animation.cpp	2009-12-07 18:22:18 UTC (rev 46280)
@@ -176,7 +176,7 @@
 		M4Sprite *spr = _spriteSeries->getFrame(seriesFrameIndex);
 
 		// FIXME: We assume that the transparent color is the color of the top left pixel
-		byte *transparentColor = (byte *)spr->pixels;
+		byte *transparentColor = spr->getBasePtr(0, 0);
 
 		// FIXME: correct x, y
 		spr->copyTo(bg, frame->x, frame->y, (int)*transparentColor);

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2009-12-07 18:20:20 UTC (rev 46279)
+++ scummvm/trunk/engines/m4/console.cpp	2009-12-07 18:22:18 UTC (rev 46280)
@@ -224,7 +224,7 @@
 				break;
 
 			// FIXME: We assume that the transparent color is the color of the top left pixel
-			byte *transparentColor = (byte *)spr->pixels;
+			byte *transparentColor = spr->getBasePtr(0, 0);
 
 			spr->copyTo(bg, x, y, (int)*transparentColor);
 

Modified: scummvm/trunk/engines/m4/events.cpp
===================================================================
--- scummvm/trunk/engines/m4/events.cpp	2009-12-07 18:20:20 UTC (rev 46279)
+++ scummvm/trunk/engines/m4/events.cpp	2009-12-07 18:22:18 UTC (rev 46280)
@@ -240,7 +240,7 @@
 	_cursor = _cursorSprites->getFrame(cursorIndex);
 
 	// Set the cursor to the sprite
-	CursorMan.replaceCursor((const byte *)_cursor->getBasePtr(), _cursor->w, _cursor->h, _cursor->xOffset, _cursor->yOffset, 0);
+	CursorMan.replaceCursor((const byte *)_cursor->getBasePtr(), _cursor->width(), _cursor->height(), _cursor->xOffset, _cursor->yOffset, 0);
 
 	return true;
 }

Modified: scummvm/trunk/engines/m4/graphics.h
===================================================================
--- scummvm/trunk/engines/m4/graphics.h	2009-12-07 18:20:20 UTC (rev 46279)
+++ scummvm/trunk/engines/m4/graphics.h	2009-12-07 18:22:18 UTC (rev 46280)
@@ -83,7 +83,7 @@
 	RGB8 *palette;
 };
 
-class M4Surface : public Graphics::Surface {
+class M4Surface : protected Graphics::Surface {
 private:
 	byte _color;
 	bool _isScreen;
@@ -96,7 +96,10 @@
 		create(g_system->getWidth(), g_system->getHeight(), 1);
 		_isScreen = isScreen;
 	}
-	M4Surface(int Width, int Height) { create(Width, Height, 1); _isScreen = false; }
+	M4Surface(int width_, int height_) {
+		create(width_, height_, 1);
+		_isScreen = false;
+	}
 
 	// loads a .COD file into the M4Surface
 	// TODO: maybe move this to the rail system? check where it makes sense
@@ -110,7 +113,7 @@
 	void madsloadInterface(int index, RGBList **palData);
 
 	void setColor(byte value) { _color = value; }
-	byte getColor() { return _color; }
+	inline byte getColor() const { return _color; }
 	void vLine(int x, int y1, int y2);
 	void hLine(int x1, int x2, int y);
 	void vLineXor(int x, int y1, int y2);
@@ -122,8 +125,8 @@
 	void drawSprite(int x, int y, SpriteInfo &info, const Common::Rect &clipRect);
 
 	// Surface methods
-	int width() { return w; }
-	int height() { return h; }
+	inline int width() const { return w; }
+	inline int height() const { return h; }
 	void setSize(int sizeX, int sizeY) { create(sizeX, sizeY, 1); }
 	inline byte *getBasePtr() {
 		return (byte *)pixels;
@@ -149,13 +152,13 @@
 	}
 
 	// copyTo methods
-	void copyTo(M4Surface *dest, int transparentColor = -1) {
+	inline void copyTo(M4Surface *dest, int transparentColor = -1) {
 		dest->copyFrom(this, Common::Rect(width(), height()), 0, 0, transparentColor);
 	}
-	void copyTo(M4Surface *dest, int x, int y, int transparentColor = -1) {
+	inline void copyTo(M4Surface *dest, int x, int y, int transparentColor = -1) {
 		dest->copyFrom(this, Common::Rect(width(), height()), x, y, transparentColor);
 	}
-	void copyTo(M4Surface *dest, const Common::Rect &srcBounds, int destX, int destY,
+	inline void copyTo(M4Surface *dest, const Common::Rect &srcBounds, int destX, int destY,
 				int transparentColor = -1) {
 		dest->copyFrom(this, srcBounds, destX, destY, transparentColor);
 	}

Modified: scummvm/trunk/engines/m4/m4_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_menus.cpp	2009-12-07 18:20:20 UTC (rev 46279)
+++ scummvm/trunk/engines/m4/m4_menus.cpp	2009-12-07 18:22:18 UTC (rev 46280)
@@ -472,8 +472,8 @@
 	// Translate the scene data
 
 	_vm->_scene->onRefresh(NULL, &srcSurface);
-	byte *srcP = (byte *)srcSurface.pixels;
-	byte *destP = (byte *)result->pixels;
+	byte *srcP = srcSurface.getBasePtr(0, 0);
+	byte *destP = result->getBasePtr(0, 0);
 
 	for (int yCtr = 0; yCtr < _vm->_scene->height() / 3; ++yCtr, srcP += g_system->getWidth() * 3) {
 		byte *src0P = srcP;
@@ -499,12 +499,12 @@
 	// averaged, simply take the top left pixel of every 3x3 pixel block
 
 	_vm->_interfaceView->onRefresh(NULL, &srcSurface);
-	destP = (byte *)result->pixels + (_vm->_screen->width() / 3) * (_vm->_interfaceView->bounds().top / 3);
+	destP = result->getBasePtr(0, 0) + (_vm->_screen->width() / 3) * (_vm->_interfaceView->bounds().top / 3);
 
 	int yStart = _vm->_interfaceView->bounds().top;
 	int yEnd = MIN(_vm->_screen->height() - 1, (int) _vm->_interfaceView->bounds().bottom - 1);
 	for (int yCtr = yStart; yCtr <= yEnd; yCtr += 3) {
-		srcP = (byte *)srcSurface.pixels + (yCtr * _vm->_screen->width());
+		srcP = (byte *)srcSurface.getBasePtr(0, yCtr) + (yCtr * _vm->_screen->width());
 
 		for (int xCtr = 0; xCtr < result->width(); ++xCtr, srcP += 3)
 			*destP++ = *srcP;

Modified: scummvm/trunk/engines/m4/mads_anim.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_anim.cpp	2009-12-07 18:20:20 UTC (rev 46279)
+++ scummvm/trunk/engines/m4/mads_anim.cpp	2009-12-07 18:22:18 UTC (rev 46280)
@@ -206,13 +206,13 @@
 				Common::copy(srcP, srcP + _bgSurface.width(), destP);
 			}
 
-			Common::copy(linesTemp, linesTemp + _panY * _bgSurface.width(), (byte *)_bgSurface.pixels);
+			Common::copy(linesTemp, linesTemp + _panY * _bgSurface.width(), _bgSurface.getBasePtr(0, 0));
 			delete[] linesTemp;
 		}
 	}
 
 	// Scroll the text surface up by one row
-	byte *pixelsP = (byte *)_textSurface.pixels;
+	byte *pixelsP = _textSurface.getBasePtr(0, 0);
 	Common::copy(pixelsP + width(),  pixelsP + _textSurface.width() * _textSurface.height(), pixelsP);
 	pixelsP = _textSurface.getBasePtr(0, _textSurface.height() - 1);
 	Common::set_to(pixelsP, pixelsP + _textSurface.width(), _vm->_palette->BLACK);

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2009-12-07 18:20:20 UTC (rev 46279)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2009-12-07 18:22:18 UTC (rev 46280)
@@ -529,7 +529,7 @@
 
 	spr = _menuItem->getFrame(1);
 	// FIXME: We assume that the transparent color is the color of the top left pixel
-	byte *transparentColor = (byte *)spr->pixels;
+	byte *transparentColor = spr->getBasePtr(0, 0);
 	spr->copyTo(this, spr->xOffset - 140, spr->yOffset - spr->height(), (int)*transparentColor);
 
 	_vm->_mouse->cursorOn();

Modified: scummvm/trunk/engines/m4/rails.cpp
===================================================================
--- scummvm/trunk/engines/m4/rails.cpp	2009-12-07 18:20:20 UTC (rev 46279)
+++ scummvm/trunk/engines/m4/rails.cpp	2009-12-07 18:22:18 UTC (rev 46280)
@@ -79,7 +79,7 @@
 		return;
 	else {
 	   M4Surface *codes = isWalkableData->codes;
-	   if (x >= 0 && x < codes->w && y >= 0 && y < codes->h) {
+	   if (x >= 0 && x < codes->width() && y >= 0 && y < codes->height()) {
 			isWalkableData->result = !((*((uint8*)codes->getBasePtr(x, y))) & 0x10);
 		} else {
 			isWalkableData->result = false;

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2009-12-07 18:20:20 UTC (rev 46279)
+++ scummvm/trunk/engines/m4/scene.cpp	2009-12-07 18:22:18 UTC (rev 46280)
@@ -435,8 +435,8 @@
 
 // Test function, shows all scene codes
 void Scene::showCodes() {
-	uint8 *pixelData = (uint8*)_codeSurface->pixels;
-	for (int i = 0; i < _codeSurface->w * _codeSurface->h; i++)
+	uint8 *pixelData = _codeSurface->getBasePtr(0, 0);
+	for (int i = 0; i < _codeSurface->width() * _codeSurface->height(); i++)
 		if (pixelData[i] & 0x10)
 			pixelData[i] = 0xFF;
 		else
@@ -450,7 +450,7 @@
 	_vm->_palette->setPalette(colors, 0, 256);
 
 	_backgroundSurface->copyFrom(_codeSurface, Common::Rect(0, 0, 640, 480), 0, 0);
-	//_system->copyRectToScreen((byte *)codes->pixels, codes->w, 0, 0, codes->w, codes->h);
+	//_system->copyRectToScreen(codes->getBasePtr(0, 0), codes->w, 0, 0, codes->w, codes->h);
 }
 
 void Scene::playIntro() {

Modified: scummvm/trunk/engines/m4/viewmgr.cpp
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.cpp	2009-12-07 18:20:20 UTC (rev 46279)
+++ scummvm/trunk/engines/m4/viewmgr.cpp	2009-12-07 18:22:18 UTC (rev 46280)
@@ -68,8 +68,7 @@
 
 //--------------------------------------------------------------------------
 
-HotkeyList::HotkeyList(View *owner) {
-	_view = owner;
+HotkeyList::HotkeyList(View *owner) : _view(owner) {
 }
 
 HotkeyList::~HotkeyList() {
@@ -106,14 +105,15 @@
 
 // View constructor
 
-View::View(M4Engine *vm, const Common::Rect &viewBounds, bool transparent):
-	_hotkeys(HotkeyList(this)), M4Surface(viewBounds.width(), viewBounds.height()), _vm(vm) {
+View::View(M4Engine *vm, const Common::Rect &viewBounds, bool transparent)
+	: M4Surface(viewBounds.width(), viewBounds.height()), _hotkeys(this), _vm(vm) {
 	SCREEN_FLAGS_DEFAULT;
 	_coords = viewBounds;
 	_transparent = transparent;
 }
 
-View::View(M4Engine *vm, int x, int y, bool transparent): _hotkeys(HotkeyList(this)), M4Surface(), _vm(vm) {
+View::View(M4Engine *vm, int x, int y, bool transparent)
+	: M4Surface(), _hotkeys(this), _vm(vm) {
 	SCREEN_FLAGS_DEFAULT;
 	_coords.left = x;
 	_coords.top = y;

Modified: scummvm/trunk/engines/m4/ws_sequence.cpp
===================================================================
--- scummvm/trunk/engines/m4/ws_sequence.cpp	2009-12-07 18:20:20 UTC (rev 46279)
+++ scummvm/trunk/engines/m4/ws_sequence.cpp	2009-12-07 18:22:18 UTC (rev 46280)
@@ -291,8 +291,8 @@
 	info.encoding = _curFrame->encoding;
 	info.inverseColorTable = _vm->_scene->getInverseColorTable();
 	info.palette = _ws->getMainPalette();
-	info.width = _curFrame->w;
-	info.height = _curFrame->h;
+	info.width = _curFrame->width();
+	info.height = _curFrame->height();
 	int32 scaler = FixedMul(_vars[kSeqVarScale], 100 << 16) >> 16;
 	info.scaleX = _vars[kSeqVarWidth] < 0 ? -scaler : scaler;
 	info.scaleY = scaler;
@@ -750,8 +750,8 @@
 
 	_streamSpriteAsset->loadStreamingFrame(_curFrame, frameNum, _vars[kSeqVarX], _vars[kSeqVarY]);
 
-	_vars[kSeqVarWidth] = _curFrame->w << 16;
-	_vars[kSeqVarHeight] = _curFrame->h << 16;
+	_vars[kSeqVarWidth] = _curFrame->width() << 16;
+	_vars[kSeqVarHeight] = _curFrame->height() << 16;
 
 	return true;
 }


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

Revision: 46281
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46281&view=rev
Author:   fingolfin
Date:     2009-12-07 18:23:28 +0000 (Mon, 07 Dec 2009)

Log Message:
-----------
M4: Move 'determine transparent color' hack into a new M4Sprite method

Modified Paths:
--------------
    scummvm/trunk/engines/m4/animation.cpp
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/sprite.cpp
    scummvm/trunk/engines/m4/sprite.h

Modified: scummvm/trunk/engines/m4/animation.cpp
===================================================================
--- scummvm/trunk/engines/m4/animation.cpp	2009-12-07 18:22:18 UTC (rev 46280)
+++ scummvm/trunk/engines/m4/animation.cpp	2009-12-07 18:23:28 UTC (rev 46281)
@@ -175,11 +175,8 @@
 		// Write the sprite onto the screen
 		M4Sprite *spr = _spriteSeries->getFrame(seriesFrameIndex);
 
-		// FIXME: We assume that the transparent color is the color of the top left pixel
-		byte *transparentColor = spr->getBasePtr(0, 0);
-
 		// FIXME: correct x, y
-		spr->copyTo(bg, frame->x, frame->y, (int)*transparentColor);
+		spr->copyTo(bg, frame->x, frame->y, (int)spr->getTransparentColor());
 
 		// HACK: wait a bit
 		g_system->delayMillis(100);

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2009-12-07 18:22:18 UTC (rev 46280)
+++ scummvm/trunk/engines/m4/console.cpp	2009-12-07 18:23:28 UTC (rev 46281)
@@ -223,11 +223,8 @@
 			if (y >= bg->height())
 				break;
 
-			// FIXME: We assume that the transparent color is the color of the top left pixel
-			byte *transparentColor = spr->getBasePtr(0, 0);
+			spr->copyTo(bg, x, y, (int)spr->getTransparentColor());
 
-			spr->copyTo(bg, x, y, (int)*transparentColor);
-
 			x += spr->width();
 			yMax = MAX(yMax, spr->height());
 		}

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2009-12-07 18:22:18 UTC (rev 46280)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2009-12-07 18:23:28 UTC (rev 46281)
@@ -528,9 +528,7 @@
 	_itemPalData.push_back(palData);
 
 	spr = _menuItem->getFrame(1);
-	// FIXME: We assume that the transparent color is the color of the top left pixel
-	byte *transparentColor = spr->getBasePtr(0, 0);
-	spr->copyTo(this, spr->xOffset - 140, spr->yOffset - spr->height(), (int)*transparentColor);
+	spr->copyTo(this, spr->xOffset - 140, spr->yOffset - spr->height(), (int)spr->getTransparentColor());
 
 	_vm->_mouse->cursorOn();
 }

Modified: scummvm/trunk/engines/m4/sprite.cpp
===================================================================
--- scummvm/trunk/engines/m4/sprite.cpp	2009-12-07 18:22:18 UTC (rev 46280)
+++ scummvm/trunk/engines/m4/sprite.cpp	2009-12-07 18:23:28 UTC (rev 46281)
@@ -171,4 +171,10 @@
 	}
 }
 
+byte M4Sprite::getTransparentColor() const {
+	// FIXME: We assume that the transparent color is the color of the
+	// top left pixel.
+	return *getBasePtr(0, 0);
+}
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/sprite.h
===================================================================
--- scummvm/trunk/engines/m4/sprite.h	2009-12-07 18:22:18 UTC (rev 46280)
+++ scummvm/trunk/engines/m4/sprite.h	2009-12-07 18:23:28 UTC (rev 46281)
@@ -114,6 +114,8 @@
 	void loadRle(Common::SeekableReadStream* rleData);
 	void loadDeltaRle(Common::SeekableReadStream* rleData, int destX, int destY);
 	void loadMadsSprite(Common::SeekableReadStream* source);
+
+	byte getTransparentColor() const;
 protected:
 };
 


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

Revision: 46330
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46330&view=rev
Author:   dreammaster
Date:     2009-12-11 09:41:27 +0000 (Fri, 11 Dec 2009)

Log Message:
-----------
Beginnings of a dialog display class

Modified Paths:
--------------
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/console.h
    scummvm/trunk/engines/m4/globals.cpp
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/module.mk
    scummvm/trunk/engines/m4/scene.cpp

Added Paths:
-----------
    scummvm/trunk/engines/m4/dialogs.cpp
    scummvm/trunk/engines/m4/dialogs.h

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2009-12-10 21:40:38 UTC (rev 46329)
+++ scummvm/trunk/engines/m4/console.cpp	2009-12-11 09:41:27 UTC (rev 46330)
@@ -25,6 +25,7 @@
 
 #include "m4/m4.h"
 #include "m4/console.h"
+#include "m4/dialogs.h"
 #include "m4/scene.h"
 #include "m4/staticres.h"
 
@@ -49,6 +50,7 @@
 	DCmd_Register("animview",		WRAP_METHOD(Console, cmdShowAnimview));
 	DCmd_Register("anim",			WRAP_METHOD(Console, cmdPlayAnimation));
 	DCmd_Register("object",			WRAP_METHOD(Console, cmdObject));
+	DCmd_Register("message",		WRAP_METHOD(Console, cmdMessage));
 }
 
 Console::~Console() {
@@ -356,4 +358,29 @@
 	return true;
 }
 
+bool Console::cmdMessage(int argc, const char **argv) {
+	VALIDATE_MADS;
+
+	if (argc == 1)
+		DebugPrintf("message 'objnum'\n");
+	else {
+		int messageId = strToInt(argv[1]);
+		int idx = _vm->_globals->messageIndexOf(messageId);
+		if (idx == -1)
+			DebugPrintf("Unknown message");
+		else
+		{
+			const char *msg = _vm->_globals->loadMessage(idx);
+			Dialog *dlg = new Dialog(_vm, msg);
+
+			_vm->_viewManager->addView(dlg);
+			_vm->_viewManager->moveToFront(dlg);
+
+			return false;
+		}
+	}
+
+	return true;
+}
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/console.h
===================================================================
--- scummvm/trunk/engines/m4/console.h	2009-12-10 21:40:38 UTC (rev 46329)
+++ scummvm/trunk/engines/m4/console.h	2009-12-11 09:41:27 UTC (rev 46330)
@@ -54,6 +54,7 @@
 	bool cmdShowAnimview(int argc, const char **argv);
 	bool cmdPlayAnimation(int argc, const char **argv);
 	bool cmdObject(int argc, const char **argv);
+	bool cmdMessage(int argc, const char **argv);
 
 private:
 	M4Engine *_vm;

Added: scummvm/trunk/engines/m4/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/m4/dialogs.cpp	                        (rev 0)
+++ scummvm/trunk/engines/m4/dialogs.cpp	2009-12-11 09:41:27 UTC (rev 46330)
@@ -0,0 +1,165 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "m4/dialogs.h"
+#include "common/file.h"
+
+namespace M4 {
+
+static void strToUpper(char *s) {
+	while (*s) {
+		*s = toupper(*s);
+		++s;
+	}
+}
+
+void Dialog::initDialog() {
+
+}
+
+void Dialog::incLine() {
+	++_numLines;
+	assert(++_numLines < 20);
+}
+
+void Dialog::writeChars(const char *line) {
+
+}
+
+void Dialog::addLine(const char *line) {
+
+}
+
+bool Dialog::matchCommand(const char *s1, const char *s2) {
+	return strncmp(s1, s2, strlen(s2)) == 0;
+}
+
+Dialog::Dialog(M4Engine *vm, const char *msgData): View(vm, Common::Rect(100, 80, 220, 140)) {
+	assert(msgData);
+	const char *srcP = msgData;
+	bool skipLine = false;
+	bool initFlag = false;
+	bool cmdFlag = false;
+	bool crFlag = false;
+
+	_dialogTitleId = 0;
+	_numLines = 0;
+	_dialogIndex = 0;
+
+	char dialogLine[256];
+	char cmdText[80];
+	char *lineP = &dialogLine[0];
+	char *cmdP = NULL;
+
+	while (*srcP != '\0') {
+		if (*srcP == '\n') {
+			// Line completed
+			*lineP = '\0';
+			++srcP;
+
+			if (!initFlag) {
+				initDialog();
+				incLine();
+				initFlag = true;
+			} else {
+				writeChars(dialogLine);
+			}
+		} else if (*srcP == '[') {
+			// Start of a command sequence
+			cmdFlag = true;
+			cmdP = &cmdText[0];
+			++srcP;
+			continue;
+		} else if (*srcP == ']') {
+			// End of a command sequence
+			*cmdP = '\0';
+			cmdFlag = false;
+			strToUpper(cmdText);
+
+			if (matchCommand(cmdText, "CENTER"))
+				// Center command
+				skipLine = true;
+			else if (matchCommand(cmdText, "TITLE")) {
+				// Title command
+				int id = atoi(cmdText + 5);
+				if (id > 0) 
+					_dialogTitleId = id;
+			} else if (matchCommand(cmdText, "CR")) {
+				// CR command
+				if (skipLine)
+					crFlag = true;
+				else {
+					initDialog();
+				}
+			} else if (matchCommand(cmdText, "ASK")) {
+				// doAsk();
+			} else if (matchCommand(cmdText, "VERB")) {
+				// Verb/vocab retrieval
+				/*getVocab(); */
+			} else if (matchCommand(cmdText, "INDEX")) {
+				// Index command
+				_dialogIndex = atoi(cmdText + 5);
+			} else if (matchCommand(cmdText, "NOUN")) {
+				// Noun command
+			} else if (matchCommand(cmdText, "SENTENCE")) {
+				// Sentence command
+			} else {
+				error("Unknown dialog command '%s' encountered", cmdText);
+			}
+		}
+
+		if (cmdFlag)
+			*cmdP++ = *srcP;
+		++srcP;
+	}
+
+	if (!skipLine)
+		incLine();
+	draw();
+}
+
+void Dialog::draw() {
+	// TODO: Implement rendering of dialog correctly
+	this->fillRect(Common::Rect(0, 0, width(), height()), 0);
+	_vm->_font->setColors(5, 5, 0xff);
+	_vm->_font->writeString(this, "This will be a dialog", 10, 10, 0, 0);
+}
+
+bool Dialog::onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents) {
+	if (_vm->_mouse->getCursorNum() != CURSOR_ARROW)
+		_vm->_mouse->setCursorNum(CURSOR_ARROW);
+
+	captureEvents = true;
+
+	if (eventType == MEVENT_LEFT_CLICK) {
+		captureEvents = false;
+		_vm->_viewManager->deleteView(this);
+	}
+
+	return true;
+}
+
+
+} // End of namespace M4


Property changes on: scummvm/trunk/engines/m4/dialogs.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: scummvm/trunk/engines/m4/dialogs.h
===================================================================
--- scummvm/trunk/engines/m4/dialogs.h	                        (rev 0)
+++ scummvm/trunk/engines/m4/dialogs.h	2009-12-11 09:41:27 UTC (rev 46330)
@@ -0,0 +1,55 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef M4_DIALOGS_H
+#define M4_DIALOGS_H
+
+#include "m4/m4.h"
+#include "m4/viewmgr.h"
+
+namespace M4 {
+
+class Dialog: public View {
+private:
+	int _numLines;
+	int _dialogTitleId;
+	int _dialogIndex;
+
+	void initDialog();
+	void incLine();
+	bool matchCommand(const char *s1, const char *s2);
+	void writeChars(const char *line);
+	void addLine(const char *line);
+	void draw();
+public:
+	Dialog(M4Engine *vm, const char *msgData);
+	virtual ~Dialog() {}
+
+	bool onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents);
+};
+
+} // End of namespace M4
+
+#endif


Property changes on: scummvm/trunk/engines/m4/dialogs.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Modified: scummvm/trunk/engines/m4/globals.cpp
===================================================================
--- scummvm/trunk/engines/m4/globals.cpp	2009-12-10 21:40:38 UTC (rev 46329)
+++ scummvm/trunk/engines/m4/globals.cpp	2009-12-11 09:41:27 UTC (rev 46330)
@@ -369,6 +369,15 @@
 	_vm->res()->toss("objects.dat");
 }
 
+int Globals::messageIndexOf(uint32 messageId) {
+	for (uint i = 0; i < _madsMessages.size(); ++i)
+	{
+		if (_madsMessages[i]->id == messageId)
+			return i;
+	}
+	return -1;
+}
+
 const char *Globals::loadMessage(uint index) {
 	if (index > _madsMessages.size() - 1) {
 		warning("Invalid message index: %i", index);
@@ -388,6 +397,7 @@
 		if (buffer[i] == '\0') buffer[i] = '\n';
 
 	_vm->res()->toss("messages.dat");
+	delete compData;
 
 	return (char*)buffer;
 }

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2009-12-10 21:40:38 UTC (rev 46329)
+++ scummvm/trunk/engines/m4/globals.h	2009-12-11 09:41:27 UTC (rev 46330)
@@ -224,6 +224,7 @@
 
 	void loadMadsMessagesInfo();
 	uint32 getMessagesSize() { return _madsMessages.size(); }
+	int messageIndexOf(uint32 messageId);
 	const char *loadMessage(uint index);
 
 	void loadMadsObjects();

Modified: scummvm/trunk/engines/m4/module.mk
===================================================================
--- scummvm/trunk/engines/m4/module.mk	2009-12-10 21:40:38 UTC (rev 46329)
+++ scummvm/trunk/engines/m4/module.mk	2009-12-11 09:41:27 UTC (rev 46330)
@@ -8,6 +8,7 @@
 	console.o \
 	converse.o \
 	detection.o \
+	dialogs.o \
 	events.o \
 	font.o \
 	globals.o \

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2009-12-10 21:40:38 UTC (rev 46329)
+++ scummvm/trunk/engines/m4/scene.cpp	2009-12-11 09:41:27 UTC (rev 46330)
@@ -25,6 +25,7 @@
 
 #include "common/system.h"
 
+#include "m4/dialogs.h"
 #include "m4/globals.h"
 #include "m4/scene.h"
 #include "m4/events.h"
@@ -555,6 +556,12 @@
 		if (_vm->getGameType() == GType_Burger) {
 			nextCommonCursor();
 			_vm->_interfaceView->_inventory.clearSelected();
+		} else {
+			// ***DEBUG*** - sample dialog display
+			const char *msg = _vm->_globals->loadMessage(10);
+			Dialog *dlg = new Dialog(_vm, msg);
+			_vm->_viewManager->addView(dlg);
+			_vm->_viewManager->moveToFront(dlg);
 		}
 		break;
 	case MEVENT_MOVE:


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

Revision: 46331
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46331&view=rev
Author:   eriktorbjorn
Date:     2009-12-11 17:14:55 +0000 (Fri, 11 Dec 2009)

Log Message:
-----------
Renamed line() to drawLine() to silence warning about function parameters in
dialogs.cpp shadowing it. Actually, the function doesn't seem to be used
anywhere at the moment, but perhaps someone has future plans for it?

Modified Paths:
--------------
    scummvm/trunk/engines/m4/graphics.cpp
    scummvm/trunk/engines/m4/graphics.h

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2009-12-11 09:41:27 UTC (rev 46330)
+++ scummvm/trunk/engines/m4/graphics.cpp	2009-12-11 17:14:55 UTC (rev 46331)
@@ -155,7 +155,7 @@
 
 }
 
-void M4Surface::line(int x1, int y1, int x2, int y2, byte color) {
+void M4Surface::drawLine(int x1, int y1, int x2, int y2, byte color) {
 	Graphics::Surface::drawLine(x1, y1, x2, y2, color);
 }
 

Modified: scummvm/trunk/engines/m4/graphics.h
===================================================================
--- scummvm/trunk/engines/m4/graphics.h	2009-12-11 09:41:27 UTC (rev 46330)
+++ scummvm/trunk/engines/m4/graphics.h	2009-12-11 17:14:55 UTC (rev 46331)
@@ -118,7 +118,7 @@
 	void hLine(int x1, int x2, int y);
 	void vLineXor(int x, int y1, int y2);
 	void hLineXor(int x1, int x2, int y);
-	void line(int x1, int y1, int x2, int y2, byte color);
+	void drawLine(int x1, int y1, int x2, int y2, byte color);
 	void frameRect(int x1, int y1, int x2, int y2);
 	void fillRect(int x1, int y1, int x2, int y2);
 


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

Revision: 46338
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46338&view=rev
Author:   dreammaster
Date:     2009-12-12 11:59:38 +0000 (Sat, 12 Dec 2009)

Log Message:
-----------
Implemented the rendering section of dialog display

Modified Paths:
--------------
    scummvm/trunk/engines/m4/dialogs.cpp
    scummvm/trunk/engines/m4/dialogs.h
    scummvm/trunk/engines/m4/font.h
    scummvm/trunk/engines/m4/graphics.cpp
    scummvm/trunk/engines/m4/graphics.h
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/viewmgr.h

Modified: scummvm/trunk/engines/m4/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/m4/dialogs.cpp	2009-12-12 11:53:44 UTC (rev 46337)
+++ scummvm/trunk/engines/m4/dialogs.cpp	2009-12-12 11:59:38 UTC (rev 46338)
@@ -35,17 +35,25 @@
 	}
 }
 
+const RGB8 DIALOG_PALETTE[8] = {
+	{0x80, 0x80, 0x80, 0xff}, {0x90, 0x90, 0x90, 0xff}, {0x70, 0x70, 0x70, 0xff}, {0x9c, 0x9c, 0x9c, 0xff},
+	{0x80, 0x80, 0x80, 0xff}, {0x90, 0x90, 0x90, 0xff}, {0xDC, 0xDC, 0xDC, 0xff}, {0x00, 0x00, 0x00, 0xff}
+};
+
+#define ROR16(v,amt) (((uint16)(v) >> amt) | ((uint16)(v) << (16 - amt)))
+
 void Dialog::initDialog() {
 
 }
 
 void Dialog::incLine() {
-	++_numLines;
-	assert(++_numLines < 20);
+	_lines.push_back(*new DialogLine());	
+	assert(_lines.size() < 20);
 }
 
 void Dialog::writeChars(const char *line) {
-
+	assert(_lines.size() > 0);
+	strcpy(_lines[_lines.size() - 1].data, line);
 }
 
 void Dialog::addLine(const char *line) {
@@ -56,7 +64,7 @@
 	return strncmp(s1, s2, strlen(s2)) == 0;
 }
 
-Dialog::Dialog(M4Engine *vm, const char *msgData): View(vm, Common::Rect(100, 80, 220, 140)) {
+Dialog::Dialog(M4Engine *vm, const char *msgData): View(vm, Common::Rect(0, 0, 0, 0)) {
 	assert(msgData);
 	const char *srcP = msgData;
 	bool skipLine = false;
@@ -64,9 +72,11 @@
 	bool cmdFlag = false;
 	bool crFlag = false;
 
-	_dialogTitleId = 0;
-	_numLines = 0;
+	_screenType = LAYER_DIALOG;
+	_widthChars = 0;
 	_dialogIndex = 0;
+	_askPosition.x = 0;
+	_askPosition.y = 0;
 
 	char dialogLine[256];
 	char cmdText[80];
@@ -105,7 +115,8 @@
 				// Title command
 				int id = atoi(cmdText + 5);
 				if (id > 0) 
-					_dialogTitleId = id;
+					// Suffix provided - specifies the dialog width in number of chars
+					_widthChars = id;
 			} else if (matchCommand(cmdText, "CR")) {
 				// CR command
 				if (skipLine)
@@ -137,14 +148,90 @@
 
 	if (!skipLine)
 		incLine();
+
+	// FIXME: Remove dummy dialog test string
+	incLine();
+	strcpy(_lines[_lines.size() - 1].data, "Test dialog");
+	_lines[_lines.size() - 1].xp = 20;
+
 	draw();
 }
 
+Dialog::~Dialog() {
+	_vm->_palette->deleteRange(_palette);
+	delete _palette;
+}
+
 void Dialog::draw() {
-	// TODO: Implement rendering of dialog correctly
-	this->fillRect(Common::Rect(0, 0, width(), height()), 0);
-	_vm->_font->setColors(5, 5, 0xff);
-	_vm->_font->writeString(this, "This will be a dialog", 10, 10, 0, 0);
+	_vm->_font->setFont(FONT_INTERFACE_MADS);
+
+	// Set up the palette for this view
+	_palette = new RGBList(8, NULL);
+	_palette->setRange(0, 8, DIALOG_PALETTE);
+	_vm->_palette->addRange(_palette);
+
+	// Calculate bounds
+	int dlgWidth = _widthChars * (_vm->_font->getMaxWidth() + 1) + 10;
+	int dlgHeight = (_lines.size() + 1) * (_vm->_font->getHeight() + 1) + 10;
+	int dialogX = (_vm->_screen->width() - dlgWidth) / 2;
+	int dialogY = (_vm->_screen->height() - dlgHeight) / 2;
+
+	// Create the surface for the dialog
+	create(dlgWidth, dlgHeight, 1);
+	_coords.left = dialogX;
+	_coords.top = dialogY;
+	_coords.right = dialogX + dlgWidth + 1;
+	_coords.bottom = dialogY + dlgHeight + 1;
+
+	// Ask position
+	//int askY = (_vm->_font->getHeight() + 1) * _askPosition.y + 3;
+
+	// Set up the dialog 
+	fillRect(Common::Rect(0, 0, width(), height()), 3);
+	setColour(2);
+	hLine(1, width() - 1, height() - 2);	// Bottom edge
+	hLine(0, width(), height() - 1);
+	vLine(width() - 2, 2, height());		// Right edge
+	vLine(width() - 1, 1, height());
+
+	// Render dialog interior
+	uint16 seed = 0xb78e;
+	for (int yp = 2; yp < (height() - 2); ++yp) {
+		byte *destP = this->getBasePtr(2, yp);
+
+		for (int xp = 2; xp < (width() - 2); ++xp) {
+			// Adjust the random seed
+			uint16 v = seed;
+			seed += 0x181D;
+			v = ROR16(v, 9);
+			seed = (seed ^ v) + ROR16(v, 3);
+			
+			*destP++ = ((seed & 0x10) != 0) ? 1 : 0;
+		}
+	}
+
+	// Handle drawing the text contents
+	_vm->_font->setColours(7, 7, 7);
+	setColour(7);
+
+	for (uint lineCtr = 0, yp = 5; lineCtr < _lines.size(); ++lineCtr, yp += _vm->_font->getHeight() + 1) {
+
+		if (_lines[lineCtr].xp == 0xff) {
+			hLine(2, width() - 6, ((_vm->_font->getHeight() + 1) >> 1) + yp);
+		} else {
+			Common::Point pt(_lines[lineCtr].xp & 0x7f, yp + 
+				(((_lines[lineCtr].xp & 0x40) != 0) ? 1 : 0));
+
+			_vm->_font->writeString(this, _lines[lineCtr].data, pt.x, pt.y, 0, 0);
+
+			if (_lines[lineCtr].xp & 0x80)
+				// Underline needed
+				hLine(pt.x, pt.x + _vm->_font->getWidth(_lines[lineCtr].data), pt.y);
+		}
+	}
+
+	// Do final translation of the dialog to game palette
+	this->translate(_palette);
 }
 
 bool Dialog::onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents) {

Modified: scummvm/trunk/engines/m4/dialogs.h
===================================================================
--- scummvm/trunk/engines/m4/dialogs.h	2009-12-12 11:53:44 UTC (rev 46337)
+++ scummvm/trunk/engines/m4/dialogs.h	2009-12-12 11:59:38 UTC (rev 46338)
@@ -28,15 +28,27 @@
 
 #include "m4/m4.h"
 #include "m4/viewmgr.h"
+#include "common/list.h"
 
 namespace M4 {
 
+class DialogLine {
+public:
+	char data[100];
+	uint8 xp;
+
+	DialogLine() { data[0] = '\0'; xp = 0; }
+};
+
 class Dialog: public View {
 private:
-	int _numLines;
-	int _dialogTitleId;
+	Common::Array<DialogLine> _lines;
+	int _widthChars;
 	int _dialogIndex;
+	Common::Point _askPosition;
+	RGBList *_palette;
 
+
 	void initDialog();
 	void incLine();
 	bool matchCommand(const char *s1, const char *s2);
@@ -45,7 +57,7 @@
 	void draw();
 public:
 	Dialog(M4Engine *vm, const char *msgData);
-	virtual ~Dialog() {}
+	virtual ~Dialog();
 
 	bool onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents);
 };

Modified: scummvm/trunk/engines/m4/font.h
===================================================================
--- scummvm/trunk/engines/m4/font.h	2009-12-12 11:53:44 UTC (rev 46337)
+++ scummvm/trunk/engines/m4/font.h	2009-12-12 11:59:38 UTC (rev 46338)
@@ -64,9 +64,12 @@
 	void setFont(const char *filename);
 	void setColor(uint8 color);
 	void setColors(uint8 alt1, uint8 alt2, uint8 foreground);
+	void setColour(uint8 colour) { setColor(colour); }
+	void setColours(uint8 alt1, uint8 alt2, uint8 foreground) { setColors(alt1, alt2, foreground); } 
 
 	int32 getWidth(char *text, int spaceWidth = -1);
 	int32 getHeight() const { return _maxHeight; }
+	int32 getMaxWidth() const { return _maxWidth; }
 	int32 write(M4Surface *surface, const char *text, int x, int y, int width, int spaceWidth, uint8 colors[]);
 	int32 writeString(M4Surface *surface, const char *text, int x, int y, int width = 0, int spaceWidth = -1) {
 		return write(surface, text, x, y, width, spaceWidth, _fontColors);

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2009-12-12 11:53:44 UTC (rev 46337)
+++ scummvm/trunk/engines/m4/graphics.cpp	2009-12-12 11:59:38 UTC (rev 46338)
@@ -59,6 +59,12 @@
 	delete[] _palIndexes;
 }
 
+void RGBList::setRange(int start, int count, const RGB8 *src) {
+	assert((start + count) <= _size);
+	
+	Common::copy(&src[0], &src[count], &_data[start]);
+}
+
 //--------------------------------------------------------------------------
 
 #define VGA_COLOR_TRANS(x) (x == 0x3f ? 255 : x << 2)

Modified: scummvm/trunk/engines/m4/graphics.h
===================================================================
--- scummvm/trunk/engines/m4/graphics.h	2009-12-12 11:53:44 UTC (rev 46337)
+++ scummvm/trunk/engines/m4/graphics.h	2009-12-12 11:59:38 UTC (rev 46338)
@@ -66,6 +66,8 @@
 	RGB8 *data() { return _data; }
 	byte *palIndexes() { return _palIndexes; }
 	int size() { return _size; }
+	RGB8 &operator[](int idx) { return _data[idx]; }
+	void setRange(int start, int count, const RGB8 *src);
 };
 
 // M4Surface
@@ -113,6 +115,7 @@
 	void madsloadInterface(int index, RGBList **palData);
 
 	void setColor(byte value) { _color = value; }
+	void setColour(byte value) { _color = value; }
 	inline byte getColor() const { return _color; }
 	void vLine(int x, int y1, int y2);
 	void hLine(int x1, int x2, int y);

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2009-12-12 11:53:44 UTC (rev 46337)
+++ scummvm/trunk/engines/m4/scene.cpp	2009-12-12 11:59:38 UTC (rev 46338)
@@ -76,7 +76,7 @@
 	if (_sceneSprites)
 		delete _sceneSprites;
 
-	_vm->_palette->deleteAllRanges();
+//	_vm->_palette->deleteAllRanges();
 
 	if (_palData)
 		delete _palData;
@@ -558,7 +558,8 @@
 			_vm->_interfaceView->_inventory.clearSelected();
 		} else {
 			// ***DEBUG*** - sample dialog display
-			const char *msg = _vm->_globals->loadMessage(10);
+			int idx = _vm->_globals->messageIndexOf(0x277a);
+			const char *msg = _vm->_globals->loadMessage(idx);
 			Dialog *dlg = new Dialog(_vm, msg);
 			_vm->_viewManager->addView(dlg);
 			_vm->_viewManager->moveToFront(dlg);
@@ -840,6 +841,9 @@
 	_vm->_font->setFont(FONT_INTERFACE_MADS);
 	char buffer[100];
 
+	// Check to see if any dialog is currently active
+	bool dialogVisible = _vm->_viewManager->getView(LAYER_DIALOG) != NULL;
+
 	// Highlighting logic for action list
 	int actionIndex = 0;
 	for (int x = 0; x < 2; ++x) {
@@ -901,7 +905,7 @@
 		M4Sprite *spr = _objectSprites->getFrame(_objectFrameNumber / INV_ANIM_FRAME_SPEED);
 		spr->copyTo(destSurface, INVENTORY_X, INVENTORY_Y, 0);
 
-		if (!_vm->_globals->invObjectsStill) {
+		if (!_vm->_globals->invObjectsStill && !dialogVisible) {
 			// If objetcs are to animated, move to the next frame
 			if (++_objectFrameNumber >= (_objectSprites->getCount() * INV_ANIM_FRAME_SPEED))
 				_objectFrameNumber = 0;

Modified: scummvm/trunk/engines/m4/viewmgr.h
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.h	2009-12-12 11:53:44 UTC (rev 46337)
+++ scummvm/trunk/engines/m4/viewmgr.h	2009-12-12 11:59:38 UTC (rev 46338)
@@ -45,7 +45,7 @@
 enum ScreenEventType {SCREVENT_NONE = 0, SCREVENT_KEY = 1, SCREVENT_MOUSE = 2, SCREVENT_ALL = 3};
 enum ScreenLayers {
 	LAYER_BACKGROUND = 0, LAYER_DRIFTER = 1, LAYER_INTERFACE = 1, LAYER_FLOATER = 2,
-	LAYER_SURFACE = 3, LAYER_MENU = 9, LAYER_MOUSE = 15
+	LAYER_SURFACE = 3, LAYER_MENU = 9, LAYER_DIALOG = 10, LAYER_MOUSE = 15
 };
 
 enum ViewIds {


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

Revision: 46402
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46402&view=rev
Author:   dreammaster
Date:     2009-12-17 07:55:08 +0000 (Thu, 17 Dec 2009)

Log Message:
-----------
Implemented basic message parsing

Modified Paths:
--------------
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/dialogs.cpp
    scummvm/trunk/engines/m4/dialogs.h
    scummvm/trunk/engines/m4/font.cpp
    scummvm/trunk/engines/m4/font.h
    scummvm/trunk/engines/m4/scene.cpp

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2009-12-17 02:08:22 UTC (rev 46401)
+++ scummvm/trunk/engines/m4/console.cpp	2009-12-17 07:55:08 UTC (rev 46402)
@@ -371,7 +371,7 @@
 		else
 		{
 			const char *msg = _vm->_globals->loadMessage(idx);
-			Dialog *dlg = new Dialog(_vm, msg);
+			Dialog *dlg = new Dialog(_vm, msg, "TEST DIALOG");
 
 			_vm->_viewManager->addView(dlg);
 			_vm->_viewManager->moveToFront(dlg);

Modified: scummvm/trunk/engines/m4/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/m4/dialogs.cpp	2009-12-17 02:08:22 UTC (rev 46401)
+++ scummvm/trunk/engines/m4/dialogs.cpp	2009-12-17 07:55:08 UTC (rev 46402)
@@ -42,60 +42,168 @@
 
 #define ROR16(v,amt) (((uint16)(v) >> amt) | ((uint16)(v) << (16 - amt)))
 
+const int DIALOG_SPACING = 1;
+
 void Dialog::initDialog() {
-
+	incLine();
 }
 
 void Dialog::incLine() {
+	_lineX = 0;
+	_widthX = 0;
+
 	_lines.push_back(*new DialogLine());	
-	assert(_lines.size() < 20);
+	assert(_lines.size() <= 20);
 }
 
-void Dialog::writeChars(const char *line) {
-	assert(_lines.size() > 0);
-	strcpy(_lines[_lines.size() - 1].data, line);
+void Dialog::writeChars(const char *srcLine) {
+	char wordStr[80];
+	char line[80];
+	int lineLen, lineWidth;
+	const char *srcP = srcLine;
+
+	while (*srcP) {
+		bool wordEndedP = false, newlineP = false;
+		char *destP = &wordStr[0];
+		Common::set_to(&wordStr[0], &wordStr[80], 0);
+
+		// Try and get the next word
+		for (;;) {
+			char v = *srcP;
+			*destP++ = v;
+
+			if (v == '\0') break;
+			if (v == '\n') {
+				newlineP = true;
+				++srcP;
+				--destP;
+				break;
+			}
+
+			if (v == ' ') {
+				// Word separator
+				++srcP;
+				--destP;
+				wordEndedP = true;
+			} else {
+				// Standard character
+				if (!wordEndedP)
+					// Still in the initial word
+					++srcP;
+				else {
+					// First character of next word, so time to break
+					--destP;
+					break;
+				}
+			}
+		}
+
+		if (destP < &wordStr[0])
+			destP = &wordStr[0];
+		*destP = '\0';
+
+		lineLen = strlen(wordStr);
+
+		strcpy(line, "");
+		if (_lineX > 0)
+			strcat(line, " ");
+		strcat(line, wordStr);
+
+		lineLen = strlen(line);
+		lineWidth = _vm->_font->getWidth(line, DIALOG_SPACING);
+
+		if (((_lineX + lineLen) > _widthChars) || ((_widthX + lineWidth) > _dialogWidth)) {
+			incLine();
+			appendText(wordStr);
+		} else {
+			appendText(line);
+		}
+
+		if (newlineP)
+			incLine();
+	}
 }
 
-void Dialog::addLine(const char *line) {
+void Dialog::appendText(const char *line) {
+	_lineX += strlen(line);
+	_widthX += _vm->_font->getWidth(line, DIALOG_SPACING);
 
+	strcat(_lines[_lines.size() - 1].data, line);
 }
 
+void Dialog::addLine(const char *line, bool underlineP) {
+	if ((_widthX > 0) || (_lineX > 0))
+		incLine();
+
+	int lineWidth = _vm->_font->getWidth(line, DIALOG_SPACING);
+	int lineLen = strlen(line);
+
+	if ((lineWidth > _dialogWidth) || (lineLen >= _widthChars))
+		writeChars(line);
+	else {
+		_lines[_lines.size() - 1].xp = (_dialogWidth - lineWidth) / 2;
+		strcpy(_lines[_lines.size() - 1].data, line);
+	}
+
+	if (underlineP)
+		_lines[_lines.size() - 1].underline = true;
+
+	incLine();
+}
+
 bool Dialog::matchCommand(const char *s1, const char *s2) {
 	return strncmp(s1, s2, strlen(s2)) == 0;
 }
 
-Dialog::Dialog(M4Engine *vm, const char *msgData): View(vm, Common::Rect(0, 0, 0, 0)) {
+Dialog::Dialog(M4Engine *vm, const char *msgData, const char *title): View(vm, Common::Rect(0, 0, 0, 0)) {
 	assert(msgData);
 	const char *srcP = msgData;
 	bool skipLine = false;
 	bool initFlag = false;
 	bool cmdFlag = false;
 	bool crFlag = false;
+	bool underline = false;
 
 	_screenType = LAYER_DIALOG;
 	_widthChars = 0;
 	_dialogIndex = 0;
 	_askPosition.x = 0;
 	_askPosition.y = 0;
+	_lineX = 0;
+	_widthX = 0;
+	_dialogWidth = 0;
 
 	char dialogLine[256];
 	char cmdText[80];
 	char *lineP = &dialogLine[0];
 	char *cmdP = NULL;
 
-	while (*srcP != '\0') {
-		if (*srcP == '\n') {
+	while (*(srcP - 1) != '\0') {
+		if ((*srcP == '\n') || (*srcP == '\0')) {
 			// Line completed
 			*lineP = '\0';
 			++srcP;
 
 			if (!initFlag) {
 				initDialog();
-				incLine();
 				initFlag = true;
-			} else {
+			}
+
+			if (!skipLine)
 				writeChars(dialogLine);
+			else {
+				addLine(dialogLine, underline);
+
+				if (crFlag)
+					incLine();
 			}
+
+			// Clear the current line contents
+			dialogLine[0] = '\0';
+			lineP = &dialogLine[0];
+			skipLine = crFlag = underline = false;
+			continue;
+
 		} else if (*srcP == '[') {
 			// Start of a command sequence
 			cmdFlag = true;
@@ -108,15 +216,24 @@
 			cmdFlag = false;
 			strToUpper(cmdText);
 
-			if (matchCommand(cmdText, "CENTER"))
-				// Center command
+			if (matchCommand(cmdText, "TITLE")) {
+				// Title command - specifies the dialog width in number of characters
 				skipLine = true;
-			else if (matchCommand(cmdText, "TITLE")) {
-				// Title command
+				crFlag = true;
+				underline = true;
+
 				int id = atoi(cmdText + 5);
-				if (id > 0) 
+				if (id > 0) {
 					// Suffix provided - specifies the dialog width in number of chars
-					_widthChars = id;
+					_widthChars = id * 2;
+					_dialogWidth = id * (_vm->_font->getMaxWidth() + 1) + 10;
+				}
+			} else if (matchCommand(cmdText, "SENTENCE")) {
+				// Sentence command - loads the title into the line buffer
+				strcpy(dialogLine, title);
+				strToUpper(dialogLine);
+				lineP += strlen(dialogLine) + 1;
+
 			} else if (matchCommand(cmdText, "CR")) {
 				// CR command
 				if (skipLine)
@@ -124,8 +241,16 @@
 				else {
 					initDialog();
 				}
+
+			} else if (matchCommand(cmdText, "UNDER")) {
+				// Underline command
+				underline = true;
+
 			} else if (matchCommand(cmdText, "ASK")) {
 				// doAsk();
+			} else if (matchCommand(cmdText, "CENTER")) {
+				// Center command
+				skipLine = true;
 			} else if (matchCommand(cmdText, "VERB")) {
 				// Verb/vocab retrieval
 				/*getVocab(); */
@@ -134,26 +259,17 @@
 				_dialogIndex = atoi(cmdText + 5);
 			} else if (matchCommand(cmdText, "NOUN")) {
 				// Noun command
-			} else if (matchCommand(cmdText, "SENTENCE")) {
-				// Sentence command
 			} else {
 				error("Unknown dialog command '%s' encountered", cmdText);
 			}
 		}
 
+		*lineP++ = *srcP;
 		if (cmdFlag)
 			*cmdP++ = *srcP;
 		++srcP;
 	}
 
-	if (!skipLine)
-		incLine();
-
-	// FIXME: Remove dummy dialog test string
-	incLine();
-	strcpy(_lines[_lines.size() - 1].data, "Test dialog");
-	_lines[_lines.size() - 1].xp = 20;
-
 	draw();
 }
 
@@ -170,9 +286,15 @@
 	_palette->setRange(0, 8, DIALOG_PALETTE);
 	_vm->_palette->addRange(_palette);
 
+	// Validation
+	if (_widthChars == 0) {
+		warning("Dialog being shown without TITLE specified");
+		_widthChars = 30;
+	}
+
 	// Calculate bounds
-	int dlgWidth = _widthChars * (_vm->_font->getMaxWidth() + 1) + 10;
-	int dlgHeight = (_lines.size() + 1) * (_vm->_font->getHeight() + 1) + 10;
+	int dlgWidth = _dialogWidth;
+	int dlgHeight = _lines.size() * (_vm->_font->getHeight() + 1) + 10;
 	int dialogX = (_vm->_screen->width() - dlgWidth) / 2;
 	int dialogY = (_vm->_screen->height() - dlgHeight) / 2;
 
@@ -219,14 +341,16 @@
 		if (_lines[lineCtr].xp == 0xff) {
 			hLine(2, width() - 6, ((_vm->_font->getHeight() + 1) >> 1) + yp);
 		} else {
-			Common::Point pt(_lines[lineCtr].xp & 0x7f, yp + 
-				(((_lines[lineCtr].xp & 0x40) != 0) ? 1 : 0));
+			Common::Point pt((_lines[lineCtr].xp & 0x7f) + 5, yp);
+			if (_lines[lineCtr].xp & 0x40)
+				++pt.y;
 
-			_vm->_font->writeString(this, _lines[lineCtr].data, pt.x, pt.y, 0, 0);
+			_vm->_font->writeString(this, _lines[lineCtr].data, pt.x, pt.y, 0, DIALOG_SPACING);
 
-			if (_lines[lineCtr].xp & 0x80)
+			if (_lines[lineCtr].underline)
 				// Underline needed
-				hLine(pt.x, pt.x + _vm->_font->getWidth(_lines[lineCtr].data), pt.y);
+				hLine(pt.x, pt.x + _vm->_font->getWidth(_lines[lineCtr].data, DIALOG_SPACING), 
+					pt.y + _vm->_font->getHeight());
 		}
 	}
 

Modified: scummvm/trunk/engines/m4/dialogs.h
===================================================================
--- scummvm/trunk/engines/m4/dialogs.h	2009-12-17 02:08:22 UTC (rev 46401)
+++ scummvm/trunk/engines/m4/dialogs.h	2009-12-17 07:55:08 UTC (rev 46402)
@@ -36,27 +36,32 @@
 public:
 	char data[100];
 	uint8 xp;
+	bool underline;
 
-	DialogLine() { data[0] = '\0'; xp = 0; }
+	DialogLine() { data[0] = '\0'; xp = 0; underline = false; }
 };
 
 class Dialog: public View {
 private:
 	Common::Array<DialogLine> _lines;
 	int _widthChars;
+	int _dialogWidth;
 	int _dialogIndex;
 	Common::Point _askPosition;
 	RGBList *_palette;
+	int _lineX;
+	int _widthX;
 
 
 	void initDialog();
 	void incLine();
 	bool matchCommand(const char *s1, const char *s2);
 	void writeChars(const char *line);
-	void addLine(const char *line);
+	void addLine(const char *line, bool underlineP = false);
+	void appendText(const char *line);
 	void draw();
 public:
-	Dialog(M4Engine *vm, const char *msgData);
+	Dialog(M4Engine *vm, const char *msgData, const char *title = NULL);
 	virtual ~Dialog();
 
 	bool onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents);

Modified: scummvm/trunk/engines/m4/font.cpp
===================================================================
--- scummvm/trunk/engines/m4/font.cpp	2009-12-17 02:08:22 UTC (rev 46401)
+++ scummvm/trunk/engines/m4/font.cpp	2009-12-17 07:55:08 UTC (rev 46402)
@@ -252,7 +252,7 @@
 
 }
 
-int32 Font::getWidth(char *text, int spaceWidth) {
+int32 Font::getWidth(const char *text, int spaceWidth) {
 	/*
 	if (custom_ascii_converter) {			 // if there is a function to convert the extended ASCII characters
 		custom_ascii_converter(out_string);	 // call it with the string

Modified: scummvm/trunk/engines/m4/font.h
===================================================================
--- scummvm/trunk/engines/m4/font.h	2009-12-17 02:08:22 UTC (rev 46401)
+++ scummvm/trunk/engines/m4/font.h	2009-12-17 07:55:08 UTC (rev 46402)
@@ -67,7 +67,7 @@
 	void setColour(uint8 colour) { setColor(colour); }
 	void setColours(uint8 alt1, uint8 alt2, uint8 foreground) { setColors(alt1, alt2, foreground); } 
 
-	int32 getWidth(char *text, int spaceWidth = -1);
+	int32 getWidth(const char *text, int spaceWidth = -1);
 	int32 getHeight() const { return _maxHeight; }
 	int32 getMaxWidth() const { return _maxWidth; }
 	int32 write(M4Surface *surface, const char *text, int x, int y, int width, int spaceWidth, uint8 colors[]);

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2009-12-17 02:08:22 UTC (rev 46401)
+++ scummvm/trunk/engines/m4/scene.cpp	2009-12-17 07:55:08 UTC (rev 46402)
@@ -560,7 +560,7 @@
 			// ***DEBUG*** - sample dialog display
 			int idx = _vm->_globals->messageIndexOf(0x277a);
 			const char *msg = _vm->_globals->loadMessage(idx);
-			Dialog *dlg = new Dialog(_vm, msg);
+			Dialog *dlg = new Dialog(_vm, msg, "TEST DIALOG");
 			_vm->_viewManager->addView(dlg);
 			_vm->_viewManager->moveToFront(dlg);
 		}


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

Revision: 46418
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46418&view=rev
Author:   dreammaster
Date:     2009-12-19 05:47:31 +0000 (Sat, 19 Dec 2009)

Log Message:
-----------
Further implementation of dialog/message script language

Modified Paths:
--------------
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/dialogs.cpp
    scummvm/trunk/engines/m4/dialogs.h

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2009-12-19 05:46:26 UTC (rev 46417)
+++ scummvm/trunk/engines/m4/console.cpp	2009-12-19 05:47:31 UTC (rev 46418)
@@ -364,13 +364,15 @@
 	if (argc == 1)
 		DebugPrintf("message 'objnum'\n");
 	else {
-		int messageId = strToInt(argv[1]);
-		int idx = _vm->_globals->messageIndexOf(messageId);
-		if (idx == -1)
+		int messageIdx = strToInt(argv[1]);
+		if ((argc == 3) && !strcmp(argv[2], "id"))
+			messageIdx = _vm->_globals->messageIndexOf(messageIdx);
+
+		if (messageIdx == -1)
 			DebugPrintf("Unknown message");
 		else
 		{
-			const char *msg = _vm->_globals->loadMessage(idx);
+			const char *msg = _vm->_globals->loadMessage(messageIdx);
 			Dialog *dlg = new Dialog(_vm, msg, "TEST DIALOG");
 
 			_vm->_viewManager->addView(dlg);

Modified: scummvm/trunk/engines/m4/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/m4/dialogs.cpp	2009-12-19 05:46:26 UTC (rev 46417)
+++ scummvm/trunk/engines/m4/dialogs.cpp	2009-12-19 05:47:31 UTC (rev 46418)
@@ -35,6 +35,13 @@
 	}
 }
 
+static void strToLower(char *s) {
+	while (*s) {
+		*s = tolower(*s);
+		++s;
+	}
+}
+
 const RGB8 DIALOG_PALETTE[8] = {
 	{0x80, 0x80, 0x80, 0xff}, {0x90, 0x90, 0x90, 0xff}, {0x70, 0x70, 0x70, 0xff}, {0x9c, 0x9c, 0x9c, 0xff},
 	{0x80, 0x80, 0x80, 0xff}, {0x90, 0x90, 0x90, 0xff}, {0xDC, 0xDC, 0xDC, 0xff}, {0x00, 0x00, 0x00, 0xff}
@@ -44,10 +51,16 @@
 
 const int DIALOG_SPACING = 1;
 
+/**
+ * Handles any dialog initialisation
+ */
 void Dialog::initDialog() {
 	incLine();
 }
 
+/**
+ * Adds a new line to the dialog output
+ */
 void Dialog::incLine() {
 	_lineX = 0;
 	_widthX = 0;
@@ -56,6 +69,10 @@
 	assert(_lines.size() <= 20);
 }
 
+/**
+ * Writes some text to the dialog output, taking care of word wrapping if the text size
+ * exceeds the dialog's width
+ */
 void Dialog::writeChars(const char *srcLine) {
 	char wordStr[80];
 	char line[80];
@@ -124,6 +141,9 @@
 	}
 }
 
+/**
+ * Appends some text to the current dialog line
+ */
 void Dialog::appendText(const char *line) {
 	_lineX += strlen(line);
 	_widthX += _vm->_font->getWidth(line, DIALOG_SPACING);
@@ -131,6 +151,9 @@
 	strcat(_lines[_lines.size() - 1].data, line);
 }
 
+/**
+ * Adds a line of text to the dialog lines list
+ */
 void Dialog::addLine(const char *line, bool underlineP) {
 	if ((_widthX > 0) || (_lineX > 0))
 		incLine();
@@ -141,7 +164,7 @@
 	if ((lineWidth > _dialogWidth) || (lineLen >= _widthChars))
 		writeChars(line);
 	else {
-		_lines[_lines.size() - 1].xp = (_dialogWidth - lineWidth) / 2;
+		_lines[_lines.size() - 1].xp = (_dialogWidth - 10 - lineWidth) / 2;
 		strcpy(_lines[_lines.size() - 1].data, line);
 	}
 
@@ -151,12 +174,97 @@
 	incLine();
 }
 
+/**
+ * Adds a bar separation line to the dialog lines list
+ */
+void Dialog::addBarLine() {
+	if ((_widthX > 0) || (_lineX > 0))
+		incLine();
+
+	// Flag the line as being a bar separator
+	_lines[_lines.size() - 1].barLine = true;
+	incLine();
+}
+
+/**
+ * Retrieves a specified vocab entry
+ */
+void Dialog::getVocab(int vocabId, char **line) {
+	assert(vocabId > 0);
+	const char *vocabStr = _vm->_globals->getVocab(vocabId);
+	strcpy(*line, vocabStr);
+
+	if (_commandCase)
+		strToUpper(*line);
+	else
+		strToLower(*line);
+
+	// Move the string pointer to after the added string
+	while (!**line)
+		++*line;
+}
+
+bool Dialog::handleNounSuffix(char *destP, int nounNum, const char *srcP) {
+	char srcLine[40];
+
+	// The next source character must be a colon in front of the first verb
+	if (*srcP != ':')
+		return false;
+
+	// Copy the remainder of the line into a temporary buffer to get the seperate verbs
+	strcpy(srcLine, ++srcP);
+	char *altP = strchr(srcLine, ':');
+	if (altP)
+		*altP = '\0';
+
+	if (*srcP != '\0') {
+		while (*srcP != ':') {
+			++srcP;
+			if (!*srcP) break;
+		}
+	}
+
+	if (*srcP != '\0')
+		++srcP;
+
+	// 
+	char var_FC[40];
+	char tempLine[40];
+	strcpy(var_FC, srcP);
+	char *tmpP = &tempLine[0];
+	char *tmp2P = tmpP;
+
+	uint16 _vocabIds[2] = {1, 1}; // FIXME/TODO: Proper vocab ids
+	getVocab(_vocabIds[nounNum], &tmpP);
+	
+	if ((*(tmpP - 1) != 'S') && (*(tmpP - 1) != 's')) {
+		// Singular object
+		tmpP = &var_FC[0];
+	} else if (!strcmp(tempLine, "a ")) {
+		// Pontially plural
+		char ch = tolower(*tmp2P);
+
+		if (!((ch > 'U') || ((ch != 'A') && (ch != 'E') && (ch != 'I') && (ch != 'O'))))
+			strcpy(tempLine, "an ");
+	}
+
+	strcpy(destP, tmpP);
+	return true;
+}
+
+/**
+ * Checks whether the start of an extracted command matches a specified given command constant
+ */
 bool Dialog::matchCommand(const char *s1, const char *s2) {
-	return strncmp(s1, s2, strlen(s2)) == 0;
+	bool result = scumm_strnicmp(s1, s2, strlen(s2)) == 0;
+	_commandCase = isupper(*s1);
+	return result;
 }
 
 Dialog::Dialog(M4Engine *vm, const char *msgData, const char *title): View(vm, Common::Rect(0, 0, 0, 0)) {
 	assert(msgData);
+	_vm->_font->setFont(FONT_INTERFACE_MADS);
+
 	const char *srcP = msgData;
 	bool skipLine = false;
 	bool initFlag = false;
@@ -172,6 +280,7 @@
 	_lineX = 0;
 	_widthX = 0;
 	_dialogWidth = 0;
+	_commandCase = false;
 
 	char dialogLine[256];
 	char cmdText[80];
@@ -226,7 +335,7 @@
 				if (id > 0) {
 					// Suffix provided - specifies the dialog width in number of chars
 					_widthChars = id * 2;
-					_dialogWidth = id * (_vm->_font->getMaxWidth() + 1) + 10;
+					_dialogWidth = id * (_vm->_font->getMaxWidth() + DIALOG_SPACING) + 10;
 				}
 			} else if (matchCommand(cmdText, "SENTENCE")) {
 				// Sentence command - loads the title into the line buffer
@@ -234,31 +343,45 @@
 				strToUpper(dialogLine);
 				lineP += strlen(dialogLine) + 1;
 
+			} else if (matchCommand(cmdText, "BAR")) {
+				// Adds a full-width line instead of normal text
+				addBarLine();
+
+			} else if (matchCommand(cmdText, "CENTER")) {
+				// Center command
+				skipLine = true;
+
 			} else if (matchCommand(cmdText, "CR")) {
 				// CR command
 				if (skipLine)
 					crFlag = true;
-				else {
+				else if (!initFlag) {
 					initDialog();
+					initFlag = true;
 				}
 
+			} else if (matchCommand(cmdText, "NOUN1")) {
+				// Noun command 1
+				handleNounSuffix(lineP, 1, cmdText + 5);
+
+			} else if (matchCommand(cmdText, "NOUN1")) {
+				// Noun command 2
+				handleNounSuffix(lineP, 2, cmdText + 5);
+
+			} else if (matchCommand(cmdText, "VERB")) {
+				// Verb/vocab retrieval
+				int verbId = 1; // TODO: Get correct vocab
+				getVocab(verbId, &lineP);
+
 			} else if (matchCommand(cmdText, "UNDER")) {
 				// Underline command
 				underline = true;
 
 			} else if (matchCommand(cmdText, "ASK")) {
 				// doAsk();
-			} else if (matchCommand(cmdText, "CENTER")) {
-				// Center command
-				skipLine = true;
-			} else if (matchCommand(cmdText, "VERB")) {
-				// Verb/vocab retrieval
-				/*getVocab(); */
 			} else if (matchCommand(cmdText, "INDEX")) {
 				// Index command
 				_dialogIndex = atoi(cmdText + 5);
-			} else if (matchCommand(cmdText, "NOUN")) {
-				// Noun command
 			} else {
 				error("Unknown dialog command '%s' encountered", cmdText);
 			}
@@ -279,19 +402,13 @@
 }
 
 void Dialog::draw() {
-	_vm->_font->setFont(FONT_INTERFACE_MADS);
+	assert(_widthChars != 0);
 
 	// Set up the palette for this view
 	_palette = new RGBList(8, NULL);
 	_palette->setRange(0, 8, DIALOG_PALETTE);
 	_vm->_palette->addRange(_palette);
 
-	// Validation
-	if (_widthChars == 0) {
-		warning("Dialog being shown without TITLE specified");
-		_widthChars = 30;
-	}
-
 	// Calculate bounds
 	int dlgWidth = _dialogWidth;
 	int dlgHeight = _lines.size() * (_vm->_font->getHeight() + 1) + 10;
@@ -338,10 +455,12 @@
 
 	for (uint lineCtr = 0, yp = 5; lineCtr < _lines.size(); ++lineCtr, yp += _vm->_font->getHeight() + 1) {
 
-		if (_lines[lineCtr].xp == 0xff) {
-			hLine(2, width() - 6, ((_vm->_font->getHeight() + 1) >> 1) + yp);
+		if (_lines[lineCtr].barLine) {
+			// Bar separation line
+			hLine(5, width() - 6, ((_vm->_font->getHeight() + 1) >> 1) + yp);
 		} else {
-			Common::Point pt((_lines[lineCtr].xp & 0x7f) + 5, yp);
+			// Standard line
+			Common::Point pt(_lines[lineCtr].xp + 5, yp);
 			if (_lines[lineCtr].xp & 0x40)
 				++pt.y;
 

Modified: scummvm/trunk/engines/m4/dialogs.h
===================================================================
--- scummvm/trunk/engines/m4/dialogs.h	2009-12-19 05:46:26 UTC (rev 46417)
+++ scummvm/trunk/engines/m4/dialogs.h	2009-12-19 05:47:31 UTC (rev 46418)
@@ -37,8 +37,9 @@
 	char data[100];
 	uint8 xp;
 	bool underline;
+	bool barLine;
 
-	DialogLine() { data[0] = '\0'; xp = 0; underline = false; }
+	DialogLine() { data[0] = '\0'; xp = 0; underline = barLine = false; }
 };
 
 class Dialog: public View {
@@ -51,14 +52,17 @@
 	RGBList *_palette;
 	int _lineX;
 	int _widthX;
+	bool _commandCase;
 
-
 	void initDialog();
 	void incLine();
 	bool matchCommand(const char *s1, const char *s2);
 	void writeChars(const char *line);
 	void addLine(const char *line, bool underlineP = false);
 	void appendText(const char *line);
+	void addBarLine();
+	void getVocab(int vocabId, char **line);
+	bool handleNounSuffix(char *destP, int nounNum, const char *srcP);
 	void draw();
 public:
 	Dialog(M4Engine *vm, const char *msgData, const char *title = NULL);


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

Revision: 46424
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46424&view=rev
Author:   dreammaster
Date:     2009-12-20 07:09:40 +0000 (Sun, 20 Dec 2009)

Log Message:
-----------
Changed the M4 event handler to encode the keyboard flags into KEVENT_KEY events

Modified Paths:
--------------
    scummvm/trunk/engines/m4/converse.cpp
    scummvm/trunk/engines/m4/converse.h
    scummvm/trunk/engines/m4/events.cpp
    scummvm/trunk/engines/m4/events.h
    scummvm/trunk/engines/m4/gui.cpp
    scummvm/trunk/engines/m4/gui.h
    scummvm/trunk/engines/m4/m4_menus.cpp
    scummvm/trunk/engines/m4/m4_menus.h
    scummvm/trunk/engines/m4/m4_views.cpp
    scummvm/trunk/engines/m4/m4_views.h
    scummvm/trunk/engines/m4/mads_anim.cpp
    scummvm/trunk/engines/m4/mads_anim.h
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/mads_menus.h
    scummvm/trunk/engines/m4/viewmgr.h

Modified: scummvm/trunk/engines/m4/converse.cpp
===================================================================
--- scummvm/trunk/engines/m4/converse.cpp	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/converse.cpp	2009-12-20 07:09:40 UTC (rev 46424)
@@ -173,7 +173,7 @@
 	View::onRefresh(rects, destSurface);
 }
 
-bool ConversationView::onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents) {
+bool ConversationView::onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents) {
 	//if (!this->isVisible())
 	//	return false;
 	if (!_entriesShown)

Modified: scummvm/trunk/engines/m4/converse.h
===================================================================
--- scummvm/trunk/engines/m4/converse.h	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/converse.h	2009-12-20 07:09:40 UTC (rev 46424)
@@ -142,7 +142,7 @@
 	void setNode(int32 nodeIndex);
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
-	bool onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents);
+	bool onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents);
 	int32 getCurrentNodeIndex() { return _currentNodeIndex; }
 	void selectEntry(int entryIndex);
 

Modified: scummvm/trunk/engines/m4/events.cpp
===================================================================
--- scummvm/trunk/engines/m4/events.cpp	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/events.cpp	2009-12-20 07:09:40 UTC (rev 46424)
@@ -50,6 +50,7 @@
 	_keyCode = 0;
 	_console = new Console(_vm);
 	_mouseButtons = 0;
+	_ctrlFlag = false;
 }
 
 M4EventType Events::handleEvents() {
@@ -63,12 +64,20 @@
 			quitFlag = true;
 			break;
 		case Common::EVENT_KEYDOWN:
-			if (_event.kbd.flags == Common::KBD_CTRL) {
-				if (_event.kbd.keycode == Common::KEYCODE_d)
+			// Note: The Ctrl-D ScummVM shortcut has been specialised so it will only activate the debugger
+			// if it's the first key pressed after the Ctrl key is held down
+			if ((_event.kbd.keycode == Common::KEYCODE_LCTRL) || (_event.kbd.keycode == Common::KEYCODE_RCTRL))
+				_ctrlFlag = true;
+			
+			else if (_event.kbd.flags == Common::KBD_CTRL) {
+				if ((_event.kbd.keycode == Common::KEYCODE_d) && _ctrlFlag) {
 					_console->attach();
 					_console->onFrame();
+				}
+				_ctrlFlag = false;
 			}
-			_keyCode = (int)_event.kbd.keycode;
+			_keyCode = (int32)_event.kbd.keycode | (_event.kbd.flags << 24);
+			
 
 			break;
 		case Common::EVENT_LBUTTONDOWN:

Modified: scummvm/trunk/engines/m4/events.h
===================================================================
--- scummvm/trunk/engines/m4/events.h	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/events.h	2009-12-20 07:09:40 UTC (rev 46424)
@@ -71,9 +71,10 @@
 	M4Engine *_vm;
 	Common::Event _event;
 	M4MouseState _mouseState;
-	int _keyCode;
+	int32 _keyCode;
 	int _mouseButtons;
 	Console *_console;
+	bool _ctrlFlag;
 public:
 	bool quitFlag;
 	Events(M4Engine *vm);

Modified: scummvm/trunk/engines/m4/gui.cpp
===================================================================
--- scummvm/trunk/engines/m4/gui.cpp	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/gui.cpp	2009-12-20 07:09:40 UTC (rev 46424)
@@ -115,7 +115,7 @@
 	_callback = callbackFn;
 }
 
-bool MenuButton::onEvent(M4EventType event, int param, int x, int y, MenuObject *&currentItem) {
+bool MenuButton::onEvent(M4EventType event, int32 param, int x, int y, MenuObject *&currentItem) {
 	bool redrawFlag = false;
 	bool callbackFlag = false;
 	bool handledFlag = true;
@@ -386,7 +386,7 @@
 	sprite->copyTo(parent(), _bounds.left + _thumbX, _bounds.top, 0);
 }
 
-bool MenuHorizSlider::onEvent(M4EventType event, int param, int x, int y, MenuObject *&currentItem) {
+bool MenuHorizSlider::onEvent(M4EventType event, int32 param, int x, int y, MenuObject *&currentItem) {
 	static bool movingFlag = false;
 	static int movingX = 0;
 	bool redrawFlag = false, handledFlag = false, callbackFlag = false;
@@ -568,7 +568,7 @@
 		thumbSprite->copyTo(parent(), _bounds.left, _bounds.top + _thumbY, 0);
 }
 
-bool MenuVertSlider::onEvent(M4EventType event, int param, int x, int y, MenuObject *&currentItem) {
+bool MenuVertSlider::onEvent(M4EventType event, int32 param, int x, int y, MenuObject *&currentItem) {
 	static bool movingFlag = false;
 	static int movingY = 0;
 	static uint32 callbackTime;
@@ -858,7 +858,7 @@
 	}
 }
 
-bool MenuSaveLoadText::onEvent(M4::M4EventType event, int param, int x, int y, M4::MenuObject *&currentItem) {
+bool MenuSaveLoadText::onEvent(M4::M4EventType event, int32 param, int x, int y, M4::MenuObject *&currentItem) {
 	if (!_visible) return false;
 	bool handledFlag = MenuButton::onEvent(event, param, x, y, currentItem);
 
@@ -985,7 +985,7 @@
 	}
 }
 
-bool MenuTextField::onEvent(M4EventType event, int param, int x, int y, MenuObject *&currentItem) {
+bool MenuTextField::onEvent(M4EventType event, int32 param, int x, int y, MenuObject *&currentItem) {
 	char tempStr[MAX_SAVEGAME_NAME];
 	int tempLen;
 	char *tempP;
@@ -1177,7 +1177,7 @@
 	}
 }
 
-bool GUIButton::onEvent(M4EventType eventType, int param, int x, int y, GUIObject *&currentItem) {
+bool GUIButton::onEvent(M4EventType eventType, int32 param, int x, int y, GUIObject *&currentItem) {
 	bool result = false;
 	bool isPressed = (eventType == MEVENT_LEFT_CLICK) || (eventType == MEVENT_LEFT_HOLD) ||
 		(eventType == MEVENT_LEFT_DRAG);

Modified: scummvm/trunk/engines/m4/gui.h
===================================================================
--- scummvm/trunk/engines/m4/gui.h	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/gui.h	2009-12-20 07:09:40 UTC (rev 46424)
@@ -268,7 +268,7 @@
 	int getObjectId() { return _objectId; }
 
 	void onExecute();
-	virtual bool onEvent(M4EventType event, int param, int x, int y, MenuObject *&currentItem) { return false; }
+	virtual bool onEvent(M4EventType event, int32 param, int x, int y, MenuObject *&currentItem) { return false; }
 };
 
 class MenuButton: public MenuObject {
@@ -278,7 +278,7 @@
 		ObjectType buttonType = OBJTYPE_BUTTON);
 
 	void onRefresh();
-	bool onEvent(M4EventType event, int param, int x, int y, MenuObject *&currentItem);
+	bool onEvent(M4EventType event, int32 param, int x, int y, MenuObject *&currentItem);
 	bool getToggled() { return _objectType == OBJTYPE_OM_SWITCH_ON; }
 };
 
@@ -297,7 +297,7 @@
 		int initialPercentage, Callback callbackFn = NULL, bool transparent = false);
 
 	void onRefresh();
-	bool onEvent(M4EventType event, int param, int x, int y, MenuObject *&currentItem);
+	bool onEvent(M4EventType event, int32 param, int x, int y, MenuObject *&currentItem);
 	int percent() { return _percent; }
 };
 
@@ -326,7 +326,7 @@
 		int initialPercentage, Callback callbackFn = NULL, bool transparent = false);
 
 	void onRefresh();
-	bool onEvent(M4EventType event, int param, int x, int y, MenuObject *&currentItem);
+	bool onEvent(M4EventType event, int32 param, int x, int y, MenuObject *&currentItem);
 	MenuVertSliderState sliderState() { return _sliderState; }
 	int percent() { return _percent; }
 	void setPercentage(int value);
@@ -367,7 +367,7 @@
 		bool loadFlag = false, const char *displayText = NULL, int displayValue = 0);
 
 	void onRefresh();
-	bool onEvent(M4EventType event, int param, int x, int y, MenuObject *&currentItem);
+	bool onEvent(M4EventType event, int32 param, int x, int y, MenuObject *&currentItem);
 	void setDisplay(int value, const char *text) { _displayValue = value; _displayText = text; }
 	int getIndex() { return _index; }
 	const char *getText() { return _displayText; }
@@ -388,7 +388,7 @@
 		int displayValue = 0, bool transparent = true);
 
 	void onRefresh();
-	bool onEvent(M4EventType event, int param, int x, int y, MenuObject *&currentItem);
+	bool onEvent(M4EventType event, int32 param, int x, int y, MenuObject *&currentItem);
 
 	const char *getText() { return _displayText; }
 	int getDisplayValue() { return _displayValue; }
@@ -401,7 +401,7 @@
 public:
 	GUIRect(View *owner, const Common::Rect &bounds, int tag): GUIObject(owner, bounds) { _tag = tag; };
 
-	virtual bool onEvent(M4EventType eventType, int param, int x, int y, GUIObject *&currentItem) { return false; }
+	virtual bool onEvent(M4EventType eventType, int32 param, int x, int y, GUIObject *&currentItem) { return false; }
 	int getTag() const { return _tag; }
 };
 
@@ -418,7 +418,7 @@
 		M4Surface *normalSprite, M4Surface *mouseOverSprite, M4Surface *pressedSprite);
 
 	void onRefresh();
-	bool onEvent(M4EventType eventType, int param, int x, int y, GUIObject *&currentItem);
+	bool onEvent(M4EventType eventType, int32 param, int x, int y, GUIObject *&currentItem);
 	GUIButtonState getState() const { return _buttonState; }
 };
 

Modified: scummvm/trunk/engines/m4/m4_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_menus.cpp	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/m4_menus.cpp	2009-12-20 07:09:40 UTC (rev 46424)
@@ -532,7 +532,7 @@
 	}
 }
 
-bool OrionMenuView::onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents) {
+bool OrionMenuView::onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents) {
 	static Common::Point movingPos(0, 0);
 	static bool movingFlag = false;
 

Modified: scummvm/trunk/engines/m4/m4_menus.h
===================================================================
--- scummvm/trunk/engines/m4/m4_menus.h	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/m4_menus.h	2009-12-20 07:09:40 UTC (rev 46424)
@@ -70,7 +70,7 @@
 	void refresh(const Common::Rect &areaRect);
 	void close() { _closeFlag = true; }
 
-	bool onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents);
+	bool onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents);
 
 	int _originalMidiVolume;
 	SaveGameList *_saveNames;

Modified: scummvm/trunk/engines/m4/m4_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_views.cpp	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/m4_views.cpp	2009-12-20 07:09:40 UTC (rev 46424)
@@ -91,7 +91,7 @@
 	}
 }
 
-bool GUIInventory::onEvent(M4EventType eventType, int param, int x, int y, GUIObject *&currentItem) {
+bool GUIInventory::onEvent(M4EventType eventType, int32 param, int x, int y, GUIObject *&currentItem) {
 	bool result = false;
 	int overIndex = getInsideIndex(x, y);
 	bool isPressed = (eventType == MEVENT_LEFT_CLICK) || (eventType == MEVENT_LEFT_HOLD) ||
@@ -268,7 +268,7 @@
 	_highlightedIndex = index;
 }
 
-bool GameInterfaceView::onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents) {
+bool GameInterfaceView::onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents) {
 	static bool selectionFlag = false;
 	if (eventType == MEVENT_LEFT_RELEASE)
 		selectionFlag = false;

Modified: scummvm/trunk/engines/m4/m4_views.h
===================================================================
--- scummvm/trunk/engines/m4/m4_views.h	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/m4_views.h	2009-12-20 07:09:40 UTC (rev 46424)
@@ -64,7 +64,7 @@
 				 int horizCells, int vertCells, int cellWidth, int cellHeight, int tag);
 
 	void onRefresh();
-	bool onEvent(M4EventType eventType, int param, int x, int y, GUIObject *&currentItem);
+	bool onEvent(M4EventType eventType, int32 param, int x, int y, GUIObject *&currentItem);
 
 	void add(const char *name, const char *verb, M4Surface *icon, int iconIndex);
 	bool remove(const char *name);
@@ -104,7 +104,7 @@
 	~GameInterfaceView();
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
-	bool onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents);
+	bool onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents);
 	void setStatusText(const char *text) { _statusText.setText(text); }
 	void cancelSentence() { setStatusText(NULL); }
 	void inventoryAdd(const char *name, const char *verb, int iconIndex) {

Modified: scummvm/trunk/engines/m4/mads_anim.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_anim.cpp	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/mads_anim.cpp	2009-12-20 07:09:40 UTC (rev 46424)
@@ -120,7 +120,7 @@
 	processLines();
 }
 
-bool TextviewView::onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents) {
+bool TextviewView::onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents) {
 	if (!_processEvents)
 		return false;
 
@@ -494,7 +494,7 @@
 	_script = _vm->res()->get(_resourceName);
 }
 
-bool AnimviewView::onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents) {
+bool AnimviewView::onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents) {
 	// Wait for the Escape key or a mouse press
 	if (((eventType == KEVENT_KEY) && (param == Common::KEYCODE_ESCAPE)) ||
 		(eventType == MEVENT_LEFT_RELEASE) || (eventType == MEVENT_RIGHT_RELEASE)) {

Modified: scummvm/trunk/engines/m4/mads_anim.h
===================================================================
--- scummvm/trunk/engines/m4/mads_anim.h	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/mads_anim.h	2009-12-20 07:09:40 UTC (rev 46424)
@@ -81,7 +81,7 @@
 	bool isAnimating() { return _animating; }
 	void scriptDone();
 
-	bool onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents);
+	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
 	void updateState();
 };
 
@@ -128,7 +128,7 @@
 	void setScript(const char *resourceName, AnimviewCallback callback);
 	void scriptDone();
 
-	bool onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents);
+	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
 	void updateState();
 };
 

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2009-12-20 07:09:40 UTC (rev 46424)
@@ -88,7 +88,7 @@
 	}
 }
 
-bool RexMainMenuView::onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents) {
+bool RexMainMenuView::onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents) {
 	// Handle keypresses - these can be done at any time, even when the menu items are being drawn
 	if (eventType == KEVENT_KEY) {
 		switch (param) {
@@ -351,7 +351,7 @@
 
 }
 
-bool MadsMainMenuView::onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents) {
+bool MadsMainMenuView::onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents) {
 	return false;
 }
 
@@ -394,7 +394,7 @@
 	}
 }
 
-bool DragonMainMenuView::onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents) {
+bool DragonMainMenuView::onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents) {
 	char resName[20];
 	Common::SeekableReadStream *data;
 

Modified: scummvm/trunk/engines/m4/mads_menus.h
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.h	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/mads_menus.h	2009-12-20 07:09:40 UTC (rev 46424)
@@ -52,7 +52,7 @@
 	RexMainMenuView(M4Engine *vm);
 	~RexMainMenuView();
 
-	bool onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents);
+	bool onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents);
 	void updateState();
 };
 
@@ -74,7 +74,7 @@
 	DragonMainMenuView(M4Engine *vm);
 	~DragonMainMenuView();
 
-	bool onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents);
+	bool onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents);
 	void updateState();
 };
 
@@ -82,7 +82,7 @@
 public:
 	MadsMainMenuView(M4Engine *vm);
 
-	bool onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents);
+	bool onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents);
 	void updateState();
 };
 

Modified: scummvm/trunk/engines/m4/viewmgr.h
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.h	2009-12-19 23:33:48 UTC (rev 46423)
+++ scummvm/trunk/engines/m4/viewmgr.h	2009-12-20 07:09:40 UTC (rev 46424)
@@ -135,7 +135,7 @@
 	HotkeyList &hotkeys() { return _hotkeys; }
 
 	virtual void onRefresh(RectList *rects, M4Surface *destSurface);
-	virtual bool onEvent(M4EventType eventType, int param, int x, int y, bool &captureEvents) { return false; }
+	virtual bool onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents) { return false; }
 	virtual void updateState() {};
 
 protected:


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

Revision: 46425
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46425&view=rev
Author:   dreammaster
Date:     2009-12-20 07:10:32 +0000 (Sun, 20 Dec 2009)

Log Message:
-----------
Started implementation of the original game's cheat mode

Modified Paths:
--------------
    scummvm/trunk/engines/m4/dialogs.cpp
    scummvm/trunk/engines/m4/dialogs.h
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h
    scummvm/trunk/engines/m4/staticres.cpp
    scummvm/trunk/engines/m4/staticres.h

Modified: scummvm/trunk/engines/m4/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/m4/dialogs.cpp	2009-12-20 07:09:40 UTC (rev 46424)
+++ scummvm/trunk/engines/m4/dialogs.cpp	2009-12-20 07:10:32 UTC (rev 46425)
@@ -364,19 +364,25 @@
 				// Noun command 1
 				handleNounSuffix(lineP, 1, cmdText + 5);
 
-			} else if (matchCommand(cmdText, "NOUN1")) {
+			} else if (matchCommand(cmdText, "NOUN2")) {
 				// Noun command 2
 				handleNounSuffix(lineP, 2, cmdText + 5);
 
+			} else if (matchCommand(cmdText, "TAB")) {
+				// Specifies the X offset for the current line
+				_lines[_lines.size() - 1].xp = atoi(cmdText + 3);
+
+			} else if (matchCommand(cmdText, "UNDER")) {
+				// Underline command
+				underline = true;
+
 			} else if (matchCommand(cmdText, "VERB")) {
 				// Verb/vocab retrieval
 				int verbId = 1; // TODO: Get correct vocab
 				getVocab(verbId, &lineP);
 
-			} else if (matchCommand(cmdText, "UNDER")) {
-				// Underline command
-				underline = true;
 
+
 			} else if (matchCommand(cmdText, "ASK")) {
 				// doAsk();
 			} else if (matchCommand(cmdText, "INDEX")) {
@@ -396,6 +402,27 @@
 	draw();
 }
 
+Dialog::Dialog(M4Engine *vm, int widthChars, const char **descEntries): View(vm, Common::Rect(0, 0, 0, 0)) {
+	_vm->_font->setFont(FONT_INTERFACE_MADS);
+	_widthChars = widthChars * 2;
+	_dialogWidth = widthChars * (_vm->_font->getMaxWidth() + DIALOG_SPACING) + 10;
+	_screenType = LAYER_DIALOG;
+	_lineX = 0;
+	_widthX = 0;
+
+	while (*descEntries != NULL) {
+		incLine();
+		writeChars(*descEntries);
+
+		int lineWidth = _vm->_font->getWidth(*descEntries, DIALOG_SPACING);
+		_lines[_lines.size() - 1].xp = (_dialogWidth - 10 - lineWidth) / 2;
+		++descEntries;
+	}
+
+	_lines[0].underline = true;
+	draw();
+}
+
 Dialog::~Dialog() {
 	_vm->_palette->deleteRange(_palette);
 	delete _palette;
@@ -477,7 +504,7 @@
 	this->translate(_palette);
 }
 
-bool Dialog::onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents) {
+bool Dialog::onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents) {
 	if (_vm->_mouse->getCursorNum() != CURSOR_ARROW)
 		_vm->_mouse->setCursorNum(CURSOR_ARROW);
 
@@ -491,5 +518,10 @@
 	return true;
 }
 
+void Dialog::display(M4Engine *vm, int widthChars, const char **descEntries) {
+	Dialog *dlg = new Dialog(vm, widthChars, descEntries);
+	vm->_viewManager->addView(dlg);
+	vm->_viewManager->moveToFront(dlg);
+}
 
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/dialogs.h
===================================================================
--- scummvm/trunk/engines/m4/dialogs.h	2009-12-20 07:09:40 UTC (rev 46424)
+++ scummvm/trunk/engines/m4/dialogs.h	2009-12-20 07:10:32 UTC (rev 46425)
@@ -66,9 +66,12 @@
 	void draw();
 public:
 	Dialog(M4Engine *vm, const char *msgData, const char *title = NULL);
+	Dialog(M4Engine *vm, int widthChars, const char **descEntries);
 	virtual ~Dialog();
 
-	bool onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents);
+	static void display(M4Engine *vm, int widthChars, const char **descEntries);
+
+	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
 };
 
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2009-12-20 07:09:40 UTC (rev 46424)
+++ scummvm/trunk/engines/m4/scene.cpp	2009-12-20 07:10:32 UTC (rev 46425)
@@ -34,6 +34,7 @@
 #include "m4/font.h"
 #include "m4/m4_views.h"
 #include "m4/compression.h"
+#include "m4/staticres.h"
 
 namespace M4 {
 
@@ -490,7 +491,7 @@
 	View::onRefresh(rects, destSurface);
 }
 
-bool Scene::onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents) {
+bool Scene::onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents) {
 	//if (_vm->getGameType() != GType_Burger)
 	//	return false;
 
@@ -558,7 +559,7 @@
 			_vm->_interfaceView->_inventory.clearSelected();
 		} else {
 			// ***DEBUG*** - sample dialog display
-			int idx = _vm->_globals->messageIndexOf(0x277a);
+			int idx = 3; //_vm->_globals->messageIndexOf(0x277a);
 			const char *msg = _vm->_globals->loadMessage(idx);
 			Dialog *dlg = new Dialog(_vm, msg, "TEST DIALOG");
 			_vm->_viewManager->addView(dlg);
@@ -733,6 +734,7 @@
 	_highlightedElement = -1;
 	_topIndex = 0;
 	_selectedObject = -1;
+	_cheatKeyCtr = 0;
 
 	_objectSprites = NULL;
 	_objectPalData = NULL;
@@ -930,7 +932,7 @@
 	}
 }
 
-bool MadsInterfaceView::onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents) {
+bool MadsInterfaceView::onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents) {
 	// If the mouse isn't being held down, then reset the repeated scroll timer
 	if (eventType != MEVENT_LEFT_HOLD)
 		_nextScrollerTicks = 0;
@@ -1000,6 +1002,12 @@
 		}
 		return true;
 
+	case KEVENT_KEY:
+		if (_cheatKeyCtr == CHEAT_SEQUENCE_MAX)
+			handleCheatKey(param1);
+		handleKeypress(param1);
+		return true;
+
 	default:
 		break;
 	}
@@ -1007,4 +1015,49 @@
 	return false;
 }
 
+bool MadsInterfaceView::handleCheatKey(int32 keycode) {
+	switch (keycode) {
+	case Common::KEYCODE_SPACE:
+		// TODO: Move player to current destination
+		return true;
+
+	case Common::KEYCODE_t | (Common::KEYCODE_LALT):
+	case Common::KEYCODE_t | (Common::KEYCODE_RALT):
+	{
+		// Teleport to room
+		//Scene *sceneView = (Scene *)vm->_viewManager->getView(VIEWID_SCENE);
+		
+
+		return true;
+	}
+
+	default:
+		break;
+	}
+
+	return false;
+}
+
+const char *CHEAT_SEQUENCE = "widepipe";
+
+bool MadsInterfaceView::handleKeypress(int32 keycode) {
+	int flags = keycode >> 24;
+	int kc = keycode & 0xffff;
+
+	// Capitalise the letter if necessary
+	if (_cheatKeyCtr < CHEAT_SEQUENCE_MAX) {
+		if ((flags == Common::KBD_CTRL) && (kc == CHEAT_SEQUENCE[_cheatKeyCtr])) {
+			++_cheatKeyCtr;
+			if (_cheatKeyCtr == CHEAT_SEQUENCE_MAX)
+				Dialog::display(_vm, 22, cheatingEnabledDesc);
+			return true;
+		} else {
+			_cheatKeyCtr = 0;
+		}
+	}
+
+	return false;
+}
+
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2009-12-20 07:09:40 UTC (rev 46424)
+++ scummvm/trunk/engines/m4/scene.h	2009-12-20 07:10:32 UTC (rev 46425)
@@ -43,6 +43,8 @@
 #define INTERFACE_HEIGHT 106
 #define MADS_SURFACE_HEIGHT 156
 
+#define CHEAT_SEQUENCE_MAX 8
+
 enum MADSVerbs {
 	kVerbNone   = 0,
 	kVerbLook	= 3,
@@ -106,7 +108,7 @@
 	void showMADSV2TextBox(char *text, int x, int y, char *faceName);
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
-	bool onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents);
+	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
 
 private:
 	int _currentScene;
@@ -148,6 +150,7 @@
 	int _highlightedElement;
 	int _topIndex;
 	uint32 _nextScrollerTicks;
+	int _cheatKeyCtr;
 	
 	// Object display fields
 	int _selectedObject;
@@ -156,6 +159,8 @@
 	int _objectFrameNumber;
 
 	void setFontMode(InterfaceFontMode newMode);
+	bool handleCheatKey(int32 keycode);
+	bool handleKeypress(int32 keycode);
 public:
 	MadsInterfaceView(M4Engine *vm);
 	~MadsInterfaceView();
@@ -165,7 +170,7 @@
 	void addObjectToInventory(int objectNumber);
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
-	bool onEvent(M4EventType eventType, int param1, int x, int y, bool &captureEvents);
+	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
 };
 
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/staticres.cpp
===================================================================
--- scummvm/trunk/engines/m4/staticres.cpp	2009-12-20 07:09:40 UTC (rev 46424)
+++ scummvm/trunk/engines/m4/staticres.cpp	2009-12-20 07:10:32 UTC (rev 46425)
@@ -31,4 +31,11 @@
 	NULL, "with", "to", "at", "from", "on", "in", "under", "behind"
 };
 
+const char *cheatingEnabledDesc[3] = {
+	"CHEATING ENABLED",
+	"(For your convenience).",
+	NULL
+};
+
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/staticres.h
===================================================================
--- scummvm/trunk/engines/m4/staticres.h	2009-12-20 07:09:40 UTC (rev 46424)
+++ scummvm/trunk/engines/m4/staticres.h	2009-12-20 07:10:32 UTC (rev 46425)
@@ -33,6 +33,8 @@
 
 extern const char *englishMADSArticleList[9];
 
+extern const char *cheatingEnabledDesc[3];
+
 } // End of namespace M4
 
 #endif


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

Revision: 47705
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47705&view=rev
Author:   dreammaster
Date:     2010-01-30 09:21:07 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Beginnings of a separation of the MADS and M4 engines into separate classes. This will be cleaner then having checks everywhere for whether the game mode is MADS or M4.

Modified Paths:
--------------
    scummvm/trunk/engines/m4/actor.cpp
    scummvm/trunk/engines/m4/actor.h
    scummvm/trunk/engines/m4/animation.cpp
    scummvm/trunk/engines/m4/animation.h
    scummvm/trunk/engines/m4/assets.cpp
    scummvm/trunk/engines/m4/assets.h
    scummvm/trunk/engines/m4/compression.cpp
    scummvm/trunk/engines/m4/compression.h
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/console.h
    scummvm/trunk/engines/m4/converse.cpp
    scummvm/trunk/engines/m4/converse.h
    scummvm/trunk/engines/m4/detection.cpp
    scummvm/trunk/engines/m4/dialogs.cpp
    scummvm/trunk/engines/m4/dialogs.h
    scummvm/trunk/engines/m4/events.cpp
    scummvm/trunk/engines/m4/events.h
    scummvm/trunk/engines/m4/font.cpp
    scummvm/trunk/engines/m4/font.h
    scummvm/trunk/engines/m4/globals.cpp
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/graphics.cpp
    scummvm/trunk/engines/m4/graphics.h
    scummvm/trunk/engines/m4/gui.cpp
    scummvm/trunk/engines/m4/gui.h
    scummvm/trunk/engines/m4/hotspot.cpp
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/m4.h
    scummvm/trunk/engines/m4/m4_menus.cpp
    scummvm/trunk/engines/m4/m4_menus.h
    scummvm/trunk/engines/m4/m4_views.cpp
    scummvm/trunk/engines/m4/m4_views.h
    scummvm/trunk/engines/m4/mads_anim.cpp
    scummvm/trunk/engines/m4/mads_anim.h
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/mads_menus.h
    scummvm/trunk/engines/m4/midi.cpp
    scummvm/trunk/engines/m4/midi.h
    scummvm/trunk/engines/m4/resource.cpp
    scummvm/trunk/engines/m4/resource.h
    scummvm/trunk/engines/m4/saveload.cpp
    scummvm/trunk/engines/m4/saveload.h
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h
    scummvm/trunk/engines/m4/script.cpp
    scummvm/trunk/engines/m4/script.h
    scummvm/trunk/engines/m4/sound.cpp
    scummvm/trunk/engines/m4/sound.h
    scummvm/trunk/engines/m4/sprite.h
    scummvm/trunk/engines/m4/viewmgr.cpp
    scummvm/trunk/engines/m4/viewmgr.h
    scummvm/trunk/engines/m4/woodscript.cpp
    scummvm/trunk/engines/m4/woodscript.h

Modified: scummvm/trunk/engines/m4/actor.cpp
===================================================================
--- scummvm/trunk/engines/m4/actor.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/actor.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -33,7 +33,7 @@
 
 #define WALKER_BURGER "Wilbur0%i"	// wilbur, with a number denoting his current direction
 
-Actor::Actor(M4Engine *vm) : _vm(vm) {
+Actor::Actor(MadsM4Engine *vm) : _vm(vm) {
 	_scaling = 100;
 	_direction = 5;
 	_walkerSprites.resize(10);
@@ -104,7 +104,7 @@
 							  _walkerSprites[kFacingSouthEast]->getColorCount());
 }
 
-Inventory::Inventory(M4Engine *vm) : _vm(vm) {
+Inventory::Inventory(MadsM4Engine *vm) : _vm(vm) {
 }
 
 Inventory::~Inventory() {

Modified: scummvm/trunk/engines/m4/actor.h
===================================================================
--- scummvm/trunk/engines/m4/actor.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/actor.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -61,7 +61,7 @@
 
 class Actor {
 public:
-	Actor(M4Engine *vm);
+	Actor(MadsM4Engine *vm);
 	~Actor();
 	void placeWalkerSpriteAt(int spriteNum, int x, int y);
 	void setWalkerScaling(int scaling) { _scaling = scaling; }
@@ -72,7 +72,7 @@
 	int getWalkerWidth();
 	int getWalkerHeight();
 private:
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	int _scaling;
 	uint8 _direction;
 	Common::Array<SpriteAsset*> _walkerSprites;
@@ -90,7 +90,7 @@
 // the normal strcmp method instead
 class Inventory {
 public:
-	Inventory(M4Engine *vm);
+	Inventory(MadsM4Engine *vm);
 	~Inventory();
 	void clear();
 	void registerObject(char* name, int32 scene, int32 icon);
@@ -107,7 +107,7 @@
 	int getTotalItems() { return _inventory.size(); }
 
 private:
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	Common::Array<InventoryObject *> _inventory;
 };
 

Modified: scummvm/trunk/engines/m4/animation.cpp
===================================================================
--- scummvm/trunk/engines/m4/animation.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/animation.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -31,7 +31,7 @@
 
 // TODO: this code needs cleanup
 
-Animation::Animation(M4Engine *vm) {
+Animation::Animation(MadsM4Engine *vm) {
 	_vm = vm;
 	_playing = false;
 }

Modified: scummvm/trunk/engines/m4/animation.h
===================================================================
--- scummvm/trunk/engines/m4/animation.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/animation.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -43,7 +43,7 @@
 
 class Animation {
     public:
-		Animation(M4Engine *vm);
+		Animation(MadsM4Engine *vm);
         ~Animation();
 
         void load(const char *filename);
@@ -54,7 +54,7 @@
 
     private:
 		bool _playing;
-		M4Engine *_vm;
+		MadsM4Engine *_vm;
         int _seriesCount;
         int _frameCount;
         int _frameEntryCount;

Modified: scummvm/trunk/engines/m4/assets.cpp
===================================================================
--- scummvm/trunk/engines/m4/assets.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/assets.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -29,13 +29,13 @@
 
 namespace M4 {
 
-BaseAsset::BaseAsset(M4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : _vm(vm) {
+BaseAsset::BaseAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : _vm(vm) {
 }
 
 BaseAsset::~BaseAsset() {
 }
 
-MachineAsset::MachineAsset(M4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : BaseAsset(vm, stream, size, name) {
+MachineAsset::MachineAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : BaseAsset(vm, stream, size, name) {
 	uint32 stateCount = stream->readUint32LE();
 	for (uint32 curState = 0; curState < stateCount; curState++) {
 		uint32 stateOffset = stream->readUint32LE();
@@ -60,7 +60,7 @@
 	return _stateTable[state];
 }
 
-SequenceAsset::SequenceAsset(M4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : BaseAsset(vm, stream, size, name) {
+SequenceAsset::SequenceAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : BaseAsset(vm, stream, size, name) {
 	_localVarCount = stream->readUint32LE();
 	_codeSize = size - 4;
 	_code = new byte[_codeSize];
@@ -77,7 +77,7 @@
 }
 
 
-DataAsset::DataAsset(M4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : BaseAsset(vm, stream, size, name) {
+DataAsset::DataAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : BaseAsset(vm, stream, size, name) {
 
 	_recCount = stream->readUint32LE();
 	_recSize = stream->readUint32LE();
@@ -97,7 +97,7 @@
 	return &_data[_recSize * index];
 }
 
-SpriteAsset::SpriteAsset(M4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name, bool asStream) : BaseAsset(vm, stream, size, name) {
+SpriteAsset::SpriteAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name, bool asStream) : BaseAsset(vm, stream, size, name) {
 	_stream = stream;
 
 	if (_vm->isM4()) {
@@ -107,7 +107,7 @@
 	}
 }
 
-void SpriteAsset::loadM4SpriteAsset(M4Engine *vm, Common::SeekableReadStream* stream, bool asStream) {
+void SpriteAsset::loadM4SpriteAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, bool asStream) {
 	bool isBigEndian = false;
 	uint32 frameOffset;
 
@@ -169,7 +169,7 @@
 
 }
 
-void SpriteAsset::loadMadsSpriteAsset(M4Engine *vm, Common::SeekableReadStream* stream) {
+void SpriteAsset::loadMadsSpriteAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream) {
 	int curFrame = 0;
 	uint32 frameOffset = 0;
 	MadsPack sprite(stream);
@@ -335,7 +335,7 @@
 	return _frameOffsets[index + 1] - _frameOffsets[index];
 }
 
-AssetManager::AssetManager(M4Engine *vm) {
+AssetManager::AssetManager(MadsM4Engine *vm) {
 
 	_vm = vm;
 

Modified: scummvm/trunk/engines/m4/assets.h
===================================================================
--- scummvm/trunk/engines/m4/assets.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/assets.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -44,21 +44,21 @@
 #define CELS__PAL MKID_BE(' PAL')	//' PAL'
 #define CELS___SS MKID_BE('  SS')	//'  SS'
 
-class M4Engine;
+class MadsM4Engine;
 
 class BaseAsset {
 public:
-	BaseAsset(M4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name);
+	BaseAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name);
 	~BaseAsset();
 	const Common::String getName() const { return _name; }
 protected:
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	Common::String _name;
 };
 
 class MachineAsset : public BaseAsset {
 public:
-	MachineAsset(M4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name);
+	MachineAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name);
 	~MachineAsset();
 	void getCode(byte *&code, uint32 &codeSize);
 	uint32 getStateOffset(uint32 state);
@@ -70,7 +70,7 @@
 
 class SequenceAsset : public BaseAsset {
 public:
-	SequenceAsset(M4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name);
+	SequenceAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name);
 	~SequenceAsset();
 	void getCode(byte *&code, uint32 &codeSize);
 	int localVarCount() const { return _localVarCount; }
@@ -82,7 +82,7 @@
 
 class DataAsset : public BaseAsset {
 public:
-	DataAsset(M4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name);
+	DataAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name);
 	~DataAsset();
 	int getCount() const { return _recCount; }
 	long *getRow(int index);
@@ -101,10 +101,10 @@
 
 class SpriteAsset : public BaseAsset {
 public:
-	SpriteAsset(M4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name, bool asStream = false);
+	SpriteAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name, bool asStream = false);
 	~SpriteAsset();
-	void loadM4SpriteAsset(M4Engine *vm, Common::SeekableReadStream* stream, bool asStream);
-	void loadMadsSpriteAsset(M4Engine *vm, Common::SeekableReadStream* stream);
+	void loadM4SpriteAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, bool asStream);
+	void loadMadsSpriteAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream);
 	int32 getCount() { return _frameCount; }
 	int32 getFrameRate() const { return _frameRate; }
 	int32 getPixelSpeed() const { return _pixelSpeed; }
@@ -149,7 +149,7 @@
 class AssetManager {
 public:
 
-	AssetManager(M4Engine *vm);
+	AssetManager(MadsM4Engine *vm);
 	~AssetManager();
 
 	bool clearAssets(AssetType assetType, int32 minHash, int32 maxHash);
@@ -168,7 +168,7 @@
 
 protected:
 	// TODO: Check if we need _vm
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 
 	MachineAsset *_MACH[256];
 	SequenceAsset *_SEQU[256];

Modified: scummvm/trunk/engines/m4/compression.cpp
===================================================================
--- scummvm/trunk/engines/m4/compression.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/compression.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -47,7 +47,7 @@
 	initialise(stream);
 }
 
-MadsPack::MadsPack(const char *resourceName, M4Engine* vm) {
+MadsPack::MadsPack(const char *resourceName, MadsM4Engine* vm) {
 	Common::SeekableReadStream *stream = vm->_resourceManager->get(resourceName);
 	initialise(stream);
 	vm->_resourceManager->toss(resourceName);

Modified: scummvm/trunk/engines/m4/compression.h
===================================================================
--- scummvm/trunk/engines/m4/compression.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/compression.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -52,7 +52,7 @@
 public:
 	static bool isCompressed(Common::SeekableReadStream *stream);
 	MadsPack(Common::SeekableReadStream *stream);
-	MadsPack(const char *resourceName, M4Engine *vm);
+	MadsPack(const char *resourceName, MadsM4Engine *vm);
 	~MadsPack();
 
 	int getCount() const { return _count; }

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/console.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -31,7 +31,7 @@
 
 namespace M4 {
 
-Console::Console(M4Engine *vm) : GUI::Debugger() {
+Console::Console(MadsM4Engine *vm) : GUI::Debugger() {
 	_vm = vm;
 
 	DCmd_Register("scene",			WRAP_METHOD(Console, cmdLoadScene));
@@ -49,8 +49,6 @@
 	DCmd_Register("textview",		WRAP_METHOD(Console, cmdShowTextview));
 	DCmd_Register("animview",		WRAP_METHOD(Console, cmdShowAnimview));
 	DCmd_Register("anim",			WRAP_METHOD(Console, cmdPlayAnimation));
-	DCmd_Register("object",			WRAP_METHOD(Console, cmdObject));
-	DCmd_Register("message",		WRAP_METHOD(Console, cmdMessage));
 }
 
 Console::~Console() {
@@ -299,10 +297,17 @@
 	return true;
 }
 
-bool Console::cmdObject(int argc, const char **argv) {
-	if (_vm->isM4()) {
-		DebugPrintf("Command not implemented for M4 games\n");
-	} else if (argc == 1) {
+/*--------------------------------------------------------------------------*/
+
+MadsConsole::MadsConsole(MadsEngine *vm): Console(vm) {
+	_vm = vm;
+
+	DCmd_Register("object",			WRAP_METHOD(MadsConsole, cmdObject));
+	DCmd_Register("message",		WRAP_METHOD(MadsConsole, cmdMessage));
+}
+
+bool MadsConsole::cmdObject(int argc, const char **argv) {
+	if (argc == 1) {
 		DebugPrintf("Usage: object ['list' | '#objnum' | 'add #objnum']\n");
 	} else if (!strcmp(argv[1], "list")) {
 		// List of objects
@@ -358,7 +363,7 @@
 	return true;
 }
 
-bool Console::cmdMessage(int argc, const char **argv) {
+bool MadsConsole::cmdMessage(int argc, const char **argv) {
 	VALIDATE_MADS;
 
 	if (argc == 1)

Modified: scummvm/trunk/engines/m4/console.h
===================================================================
--- scummvm/trunk/engines/m4/console.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/console.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -30,14 +30,13 @@
 
 namespace M4 {
 
-class M4Engine;
+class MadsM4Engine;
+class MadsEngine;
 
-class Console : public GUI::Debugger {
-public:
-	Console(M4Engine *vm);
-	virtual ~Console();
+class Console: public GUI::Debugger {
+private:
+	MadsM4Engine *_vm;
 
-private:
 	bool cmdLoadScene(int argc, const char **argv);
 	bool cmdStartingScene(int argc, const char **argv);
 	bool cmdSceneInfo(int argc, const char **argv);
@@ -53,11 +52,27 @@
 	bool cmdShowTextview(int argc, const char **argv);
 	bool cmdShowAnimview(int argc, const char **argv);
 	bool cmdPlayAnimation(int argc, const char **argv);
+
+public:
+	Console(MadsM4Engine *vm);
+	virtual ~Console();
+};
+
+class MadsConsole: public Console {
+private:
+	MadsEngine *_vm;
+
 	bool cmdObject(int argc, const char **argv);
 	bool cmdMessage(int argc, const char **argv);
+public:
+	MadsConsole(MadsEngine *vm);
+	virtual ~MadsConsole() {};
+};
 
-private:
-	M4Engine *_vm;
+class M4Console: public Console {
+public:
+	M4Console(MadsM4Engine *vm): Console(vm) {};
+	virtual ~M4Console() {};
 };
 
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/converse.cpp
===================================================================
--- scummvm/trunk/engines/m4/converse.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/converse.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -75,7 +75,7 @@
 #define CHUNK_WPRL MKID_BE('WPRL')		// weighted preply chunk
 
 
-ConversationView::ConversationView(M4Engine *vm): View(vm, Common::Rect(0,
+ConversationView::ConversationView(MadsM4Engine *vm): View(vm, Common::Rect(0,
 		vm->_screen->height() - INTERFACE_HEIGHT, vm->_screen->width(), vm->_screen->height())) {
 
 	_screenType = VIEWID_CONVERSATION;

Modified: scummvm/trunk/engines/m4/converse.h
===================================================================
--- scummvm/trunk/engines/m4/converse.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/converse.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -137,7 +137,7 @@
 
 class ConversationView: public View {
 public:
-	ConversationView(M4Engine *vm);
+	ConversationView(MadsM4Engine *vm);
 	~ConversationView();
 	void setNode(int32 nodeIndex);
 
@@ -162,7 +162,7 @@
 class Converse {
 
 public:
-	Converse(M4Engine *vm) : _vm(vm) {}
+	Converse(MadsM4Engine *vm) : _vm(vm) {}
 	~Converse() {}
 
 	void startConversation(const char *convName, bool showConversebox = true, ConverseStyle style = CONVSTYLE_EARTH );
@@ -179,7 +179,7 @@
 	void play();
 	*/
 private:
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	Common::Array<ConvEntry*>_convNodes;
 	Common::Array<MessageEntry*>_madsMessageList;
 	Common::Array<char *>_convStrings;

Modified: scummvm/trunk/engines/m4/detection.cpp
===================================================================
--- scummvm/trunk/engines/m4/detection.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/detection.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -39,10 +39,10 @@
 	uint32 features;
 };
 
-int M4Engine::getGameType() const { return _gameDescription->gameType; }
-uint32 M4Engine::getFeatures() const { return _gameDescription->features; }
-Common::Language M4Engine::getLanguage() const { return _gameDescription->desc.language; }
-Common::Platform M4Engine::getPlatform() const { return _gameDescription->desc.platform; }
+int MadsM4Engine::getGameType() const { return _gameDescription->gameType; }
+uint32 MadsM4Engine::getFeatures() const { return _gameDescription->features; }
+Common::Language MadsM4Engine::getLanguage() const { return _gameDescription->desc.language; }
+Common::Platform MadsM4Engine::getPlatform() const { return _gameDescription->desc.platform; }
 
 }
 
@@ -60,7 +60,7 @@
 
 namespace M4 {
 
-const char *M4Engine::getGameFile(int fileType) {
+const char *MadsM4Engine::getGameFile(int fileType) {
 	for (int i = 0; _gameDescription->desc.filesDescriptions[i].fileName; i++) {
 		if (_gameDescription->desc.filesDescriptions[i].fileType == fileType)
 			return _gameDescription->desc.filesDescriptions[i].fileName;
@@ -421,7 +421,10 @@
 bool M4MetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 	const M4::M4GameDescription *gd = (const M4::M4GameDescription *)desc;
 	if (gd) {
-		*engine = new M4::M4Engine(syst, gd);
+		if ((gd->gameType == M4::GType_Burger) || (gd->gameType == M4::GType_Riddle))
+			*engine = new M4::M4Engine(syst, gd);
+		else
+			*engine = new M4::MadsEngine(syst, gd);
 	}
 	return gd != 0;
 }

Modified: scummvm/trunk/engines/m4/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/m4/dialogs.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/dialogs.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -191,7 +191,7 @@
  */
 void Dialog::getVocab(int vocabId, char **line) {
 	assert(vocabId > 0);
-	const char *vocabStr = _vm->_globals->getVocab(vocabId);
+	const char *vocabStr = _madsVm->_globals->getVocab(vocabId);
 	strcpy(*line, vocabStr);
 
 	if (_commandCase)
@@ -253,6 +253,16 @@
 }
 
 /**
+ * Sets up an area within the dialog for textual input
+ */
+void Dialog::setupInputArea() {
+	_askPosition.x = _lineX + 1;
+	_askPosition.y = _lines.size();
+
+	incLine();
+}
+
+/**
  * Checks whether the start of an extracted command matches a specified given command constant
  */
 bool Dialog::matchCommand(const char *s1, const char *s2) {
@@ -261,7 +271,7 @@
 	return result;
 }
 
-Dialog::Dialog(M4Engine *vm, const char *msgData, const char *title): View(vm, Common::Rect(0, 0, 0, 0)) {
+Dialog::Dialog(MadsM4Engine *vm, const char *msgData, const char *title): View(vm, Common::Rect(0, 0, 0, 0)) {
 	assert(msgData);
 	_vm->_font->setFont(FONT_INTERFACE_MADS);
 
@@ -325,24 +335,9 @@
 			cmdFlag = false;
 			strToUpper(cmdText);
 
-			if (matchCommand(cmdText, "TITLE")) {
-				// Title command - specifies the dialog width in number of characters
-				skipLine = true;
-				crFlag = true;
-				underline = true;
+			if (matchCommand(cmdText, "ASK")) {
+				setupInputArea();
 
-				int id = atoi(cmdText + 5);
-				if (id > 0) {
-					// Suffix provided - specifies the dialog width in number of chars
-					_widthChars = id * 2;
-					_dialogWidth = id * (_vm->_font->getMaxWidth() + DIALOG_SPACING) + 10;
-				}
-			} else if (matchCommand(cmdText, "SENTENCE")) {
-				// Sentence command - loads the title into the line buffer
-				strcpy(dialogLine, title);
-				strToUpper(dialogLine);
-				lineP += strlen(dialogLine) + 1;
-
 			} else if (matchCommand(cmdText, "BAR")) {
 				// Adds a full-width line instead of normal text
 				addBarLine();
@@ -368,10 +363,29 @@
 				// Noun command 2
 				handleNounSuffix(lineP, 2, cmdText + 5);
 
+			} else if (matchCommand(cmdText, "SENTENCE")) {
+				// Sentence command - loads the title into the line buffer
+				strcpy(dialogLine, title);
+				strToUpper(dialogLine);
+				lineP += strlen(dialogLine) + 1;
+
 			} else if (matchCommand(cmdText, "TAB")) {
 				// Specifies the X offset for the current line
 				_lines[_lines.size() - 1].xp = atoi(cmdText + 3);
 
+			} else if (matchCommand(cmdText, "TITLE")) {
+				// Title command - specifies the dialog width in number of characters
+				skipLine = true;
+				crFlag = true;
+				underline = true;
+
+				int id = atoi(cmdText + 5);
+				if (id > 0) {
+					// Suffix provided - specifies the dialog width in number of chars
+					_widthChars = id * 2;
+					_dialogWidth = id * (_vm->_font->getMaxWidth() + DIALOG_SPACING) + 10;
+				}
+
 			} else if (matchCommand(cmdText, "UNDER")) {
 				// Underline command
 				underline = true;
@@ -382,9 +396,6 @@
 				getVocab(verbId, &lineP);
 
 
-
-			} else if (matchCommand(cmdText, "ASK")) {
-				// doAsk();
 			} else if (matchCommand(cmdText, "INDEX")) {
 				// Index command
 				_dialogIndex = atoi(cmdText + 5);
@@ -402,25 +413,15 @@
 	draw();
 }
 
-Dialog::Dialog(M4Engine *vm, int widthChars, const char **descEntries): View(vm, Common::Rect(0, 0, 0, 0)) {
+Dialog::Dialog(MadsM4Engine *vm, int widthChars): View(vm, Common::Rect(0, 0, 0, 0)) {
 	_vm->_font->setFont(FONT_INTERFACE_MADS);
 	_widthChars = widthChars * 2;
 	_dialogWidth = widthChars * (_vm->_font->getMaxWidth() + DIALOG_SPACING) + 10;
 	_screenType = LAYER_DIALOG;
 	_lineX = 0;
 	_widthX = 0;
-
-	while (*descEntries != NULL) {
-		incLine();
-		writeChars(*descEntries);
-
-		int lineWidth = _vm->_font->getWidth(*descEntries, DIALOG_SPACING);
-		_lines[_lines.size() - 1].xp = (_dialogWidth - 10 - lineWidth) / 2;
-		++descEntries;
-	}
-
-	_lines[0].underline = true;
-	draw();
+	_askPosition.x = 0;
+	_askPosition.y = 0;
 }
 
 Dialog::~Dialog() {
@@ -449,9 +450,6 @@
 	_coords.right = dialogX + dlgWidth + 1;
 	_coords.bottom = dialogY + dlgHeight + 1;
 
-	// Ask position
-	//int askY = (_vm->_font->getHeight() + 1) * _askPosition.y + 3;
-
 	// Set up the dialog
 	fillRect(Common::Rect(0, 0, width(), height()), 3);
 	setColour(2);
@@ -476,6 +474,11 @@
 		}
 	}
 
+	// If an ask position is set, create the input area frame
+	if (_askPosition.y > 0) {
+
+	}
+
 	// Handle drawing the text contents
 	_vm->_font->setColours(7, 7, 7);
 	setColour(7);
@@ -518,10 +521,42 @@
 	return true;
 }
 
-void Dialog::display(M4Engine *vm, int widthChars, const char **descEntries) {
-	Dialog *dlg = new Dialog(vm, widthChars, descEntries);
+void Dialog::display(MadsM4Engine *vm, int widthChars, const char **descEntries) {
+	Dialog *dlg = new Dialog(vm, widthChars);
+
+	while (*descEntries != NULL) {
+		dlg->incLine();
+		dlg->writeChars(*descEntries);
+
+		int lineWidth = vm->_font->getWidth(*descEntries, DIALOG_SPACING);
+		dlg->_lines[dlg->_lines.size() - 1].xp = (dlg->_dialogWidth - 10 - lineWidth) / 2;
+		++descEntries;
+	}
+
+	dlg->_lines[0].underline = true;
+	
+	dlg->draw();
 	vm->_viewManager->addView(dlg);
 	vm->_viewManager->moveToFront(dlg);
 }
 
+void Dialog::getValue(MadsM4Engine *vm, const char *title, const char *text, int numChars, int currentValue) {
+	int titleLen = strlen(title);
+	Dialog *dlg = new Dialog(vm, titleLen + 4);
+
+	dlg->addLine(title, true);
+	dlg->writeChars("\n");
+
+	dlg->writeChars(text);
+	dlg->setupInputArea();
+	dlg->writeChars("\n");
+
+	dlg->draw();
+	vm->_viewManager->addView(dlg);
+	vm->_viewManager->moveToFront(dlg);
+
+	// TODO: How to wait until the dialog is closed
+	
+}
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/dialogs.h
===================================================================
--- scummvm/trunk/engines/m4/dialogs.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/dialogs.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -42,6 +42,8 @@
 	DialogLine() { data[0] = '\0'; xp = 0; underline = barLine = false; }
 };
 
+typedef void (*GetValueFn)(MadsM4Engine *vm, int result);
+
 class Dialog: public View {
 private:
 	Common::Array<DialogLine> _lines;
@@ -63,13 +65,15 @@
 	void addBarLine();
 	void getVocab(int vocabId, char **line);
 	bool handleNounSuffix(char *destP, int nounNum, const char *srcP);
+	void setupInputArea();
 	void draw();
 public:
-	Dialog(M4Engine *vm, const char *msgData, const char *title = NULL);
-	Dialog(M4Engine *vm, int widthChars, const char **descEntries);
+	Dialog(MadsM4Engine *vm, const char *msgData, const char *title = NULL);
+	Dialog(MadsM4Engine *vm, int widthChars);
 	virtual ~Dialog();
 
-	static void display(M4Engine *vm, int widthChars, const char **descEntries);
+	static void display(MadsM4Engine *vm, int widthChars, const char **descEntries);
+	static void getValue(MadsM4Engine *vm, const char *title, const char *text, int numChars, int currentValue);
 
 	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
 };

Modified: scummvm/trunk/engines/m4/events.cpp
===================================================================
--- scummvm/trunk/engines/m4/events.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/events.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -44,13 +44,17 @@
  * Implements an interface to the event system								*
  *--------------------------------------------------------------------------*/
 
-Events::Events(M4Engine *vm) : _vm(vm) {
+Events::Events(MadsM4Engine *vm) : _vm(vm) {
 	_mouseState = MSTATE_NO_EVENT;
 	quitFlag = false;
 	_keyCode = 0;
-	_console = new Console(_vm);
 	_mouseButtons = 0;
 	_ctrlFlag = false;
+
+	if (_vm->isM4())
+		_console = new M4Console(_vm);
+	else
+		_console = new MadsConsole(_madsVm);
 }
 
 M4EventType Events::handleEvents() {
@@ -177,7 +181,7 @@
  * Implements an interface to the mouse										*
  *--------------------------------------------------------------------------*/
 
-Mouse::Mouse(M4Engine *vm) : _vm(vm) {
+Mouse::Mouse(MadsM4Engine *vm) : _vm(vm) {
 	_locked = false;
 	_cursorOn = false;
 	_cursor = NULL;

Modified: scummvm/trunk/engines/m4/events.h
===================================================================
--- scummvm/trunk/engines/m4/events.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/events.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -68,7 +68,7 @@
 
 class Events {
 private:
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	Common::Event _event;
 	M4MouseState _mouseState;
 	int32 _keyCode;
@@ -77,7 +77,7 @@
 	bool _ctrlFlag;
 public:
 	bool quitFlag;
-	Events(M4Engine *vm);
+	Events(MadsM4Engine *vm);
 
 	Common::Event &event() { return _event; }
 	Common::EventType type() { return _event.type; }
@@ -92,7 +92,7 @@
 
 class Mouse {
 private:
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	int _currentCursor, _lockedCursor;
 	bool _locked;
 	bool _cursorOn;
@@ -105,7 +105,7 @@
 	bool inHideArea();
 	friend class Events;
 public:
-	Mouse(M4Engine *vm);
+	Mouse(MadsM4Engine *vm);
 	~Mouse();
 
 	bool init(const char *seriesName, RGB8 *palette);

Modified: scummvm/trunk/engines/m4/font.cpp
===================================================================
--- scummvm/trunk/engines/m4/font.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/font.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -29,7 +29,7 @@
 
 namespace M4 {
 
-Font::Font(M4Engine *vm) : _vm(vm) {
+Font::Font(MadsM4Engine *vm) : _vm(vm) {
 	_sysFont = true;
 	_filename = NULL;
 	//TODO: System font

Modified: scummvm/trunk/engines/m4/font.h
===================================================================
--- scummvm/trunk/engines/m4/font.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/font.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -59,7 +59,7 @@
 
 class Font {
 public:
-	Font(M4Engine *vm);
+	Font(MadsM4Engine *vm);
 	~Font();
 	void setFont(const char *filename);
 	void setColor(uint8 color);
@@ -79,7 +79,7 @@
 	void setFontM4(const char *filename);
 	void setFontMads(const char *filename);
 
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	uint8 _maxWidth, _maxHeight;
 	uint8 *_charWidths;
 	uint16 *_charOffs;

Modified: scummvm/trunk/engines/m4/globals.cpp
===================================================================
--- scummvm/trunk/engines/m4/globals.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/globals.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -34,7 +34,7 @@
 
 namespace M4 {
 
-Kernel::Kernel(M4Engine *vm) : _vm(vm) {
+Kernel::Kernel(MadsM4Engine *vm) : _vm(vm) {
 	daemonTriggerAvailable = true;
 	firstFadeColorIndex = 0;
 	paused = false;
@@ -267,10 +267,10 @@
 
 //--------------------------------------------------------------------------
 
-Globals::Globals(M4Engine *vm): _vm(vm) {
+MadsGlobals::MadsGlobals(MadsM4Engine *vm): _vm(vm) {
 }
 
-Globals::~Globals() {
+MadsGlobals::~MadsGlobals() {
 	uint32 i;
 
 	for (i = 0; i < _madsVocab.size(); i++)
@@ -284,11 +284,11 @@
 	_madsMessages.clear();
 }
 
-bool Globals::isInterfaceVisible() {
+bool MadsGlobals::isInterfaceVisible() {
 	return _vm->_interfaceView->isVisible();
 }
 
-void Globals::loadMadsVocab() {
+void MadsGlobals::loadMadsVocab() {
 	Common::SeekableReadStream *vocabS = _vm->res()->get("vocab.dat");
 	int curPos = 0;
 
@@ -311,7 +311,7 @@
 	_vm->res()->toss("vocab.dat");
 }
 
-void Globals::loadMadsQuotes() {
+void MadsGlobals::loadMadsQuotes() {
 	Common::SeekableReadStream *quoteS = _vm->res()->get("quotes.dat");
 	int curPos = 0;
 
@@ -334,7 +334,7 @@
 	_vm->res()->toss("quotes.dat");
 }
 
-void Globals::loadMadsMessagesInfo() {
+void MadsGlobals::loadMadsMessagesInfo() {
 	Common::SeekableReadStream *messageS = _vm->res()->get("messages.dat");
 
 	int16 count = messageS->readUint16LE();
@@ -359,7 +359,7 @@
 	_vm->res()->toss("messages.dat");
 }
 
-void Globals::loadMadsObjects() {
+void MadsGlobals::loadMadsObjects() {
 	Common::SeekableReadStream *objList = _vm->res()->get("objects.dat");
 	int numObjects = objList->readUint16LE();
 
@@ -369,7 +369,7 @@
 	_vm->res()->toss("objects.dat");
 }
 
-int Globals::messageIndexOf(uint32 messageId) {
+int MadsGlobals::messageIndexOf(uint32 messageId) {
 	for (uint i = 0; i < _madsMessages.size(); ++i)
 	{
 		if (_madsMessages[i]->id == messageId)
@@ -378,7 +378,7 @@
 	return -1;
 }
 
-const char *Globals::loadMessage(uint index) {
+const char *MadsGlobals::loadMessage(uint index) {
 	if (index > _madsMessages.size() - 1) {
 		warning("Invalid message index: %i", index);
 		return NULL;
@@ -404,7 +404,7 @@
 
 //--------------------------------------------------------------------------
 
-Player::Player(M4Engine *vm) : _vm(vm) {
+Player::Player(MadsM4Engine *vm) : _vm(vm) {
 	commandsAllowed = true;
 	needToWalk = false;
 	readyToWalk = false;

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/globals.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -35,7 +35,7 @@
 
 namespace M4 {
 
-class M4Engine;
+class MadsM4Engine;
 class ScriptInterpreter;
 class ScriptFunction;
 
@@ -100,14 +100,14 @@
 
 class Kernel {
 private:
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	ScriptFunction *_globalDaemonFn, *_globalParserFn;
 	ScriptFunction *_sectionInitFn, *_sectionDaemonFn, *_sectionParserFn;
 	ScriptFunction *_roomInitFn, *_roomDaemonFn, *_roomPreParserFn, *_roomParserFn;
 	void pauseEngines();
 	void unpauseEngines();
 public:
-	Kernel(M4Engine *vm);
+	Kernel(MadsM4Engine *vm);
 
 	// TODO: Move to some palette/fading class
 	int fadeUpDuration, firstFadeColorIndex;
@@ -183,7 +183,7 @@
 
 typedef Common::Array<Common::SharedPtr<MadsObject> > MadsObjectArray;
 
-class Globals {
+class MadsGlobals {
 private:
 	struct MessageItem {
 		uint32 id;
@@ -192,14 +192,14 @@
 		uint16 compSize;
 	};
 
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	Common::Array<char* > _madsVocab;
 	Common::Array<char* > _madsQuotes;
 	Common::Array<MessageItem* > _madsMessages;
 	MadsObjectArray _madsObjects;
 public:
-	Globals(M4Engine *vm);
-	~Globals();
+	MadsGlobals(MadsM4Engine *vm);
+	~MadsGlobals();
 	bool isInterfaceVisible();
 
 	// M4 variables
@@ -236,7 +236,7 @@
 
 class Player {
 public:
-	Player(M4Engine *vm);
+	Player(MadsM4Engine *vm);
 	void setCommandsAllowed(bool value);
 
 	// Variables
@@ -265,7 +265,7 @@
 		const char *word8, const char *word9, const char *word10);
 
 private:
-	 M4Engine *_vm;
+	 MadsM4Engine *_vm;
 };
 
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/graphics.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -718,7 +718,7 @@
 
 // Support function for fading in or out
 
-static void fadeRange(M4Engine *vm, RGB8 *srcPal, RGB8 *destPal,  int startIndex, int endIndex,
+static void fadeRange(MadsM4Engine *vm, RGB8 *srcPal, RGB8 *destPal,  int startIndex, int endIndex,
 					 int numSteps, uint delayAmount) {
 	RGB8 tempPal[256];
 
@@ -746,7 +746,7 @@
 	vm->_palette->setPalette(&destPal[startIndex], startIndex, endIndex - startIndex + 1);
 }
 
-Palette::Palette(M4Engine *vm) : _vm(vm) {
+Palette::Palette(MadsM4Engine *vm) : _vm(vm) {
 	reset();
 	_fading_in_progress = false;
 	Common::set_to(&_usageCount[0], &_usageCount[256], 0);

Modified: scummvm/trunk/engines/m4/graphics.h
===================================================================
--- scummvm/trunk/engines/m4/graphics.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/graphics.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -173,7 +173,7 @@
 
 class Palette {
 private:
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	bool _colorsChanged;
 	bool _fading_in_progress;
 	byte _originalPalette[256 * 4];
@@ -182,7 +182,7 @@
 
 	void reset();
 public:
-	Palette(M4Engine *vm);
+	Palette(MadsM4Engine *vm);
 
 	void setPalette(const byte *colors, uint start, uint num);
 	void setPalette(const RGB8 *colors, uint start, uint num);

Modified: scummvm/trunk/engines/m4/gui.cpp
===================================================================
--- scummvm/trunk/engines/m4/gui.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/gui.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -1191,7 +1191,7 @@
 				_buttonState = BUTTON_PRESSED;
 			}
 
-			_vm->_globals->invSuppressClickSound = false;
+			_madsVm->_globals->invSuppressClickSound = false;
 		} else {
 			// Button isn't pressed
 			if (_tracking)

Modified: scummvm/trunk/engines/m4/gui.h
===================================================================
--- scummvm/trunk/engines/m4/gui.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/gui.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -212,12 +212,12 @@
 
 class DialogView: public View {
 public:
-	DialogView(M4Engine *Vm, const Common::Rect &viewBounds, bool transparent = false):
+	DialogView(MadsM4Engine *Vm, const Common::Rect &viewBounds, bool transparent = false):
 		View(Vm, viewBounds, transparent) {};
-	DialogView(M4Engine *Vm, int x = 0, int y = 0, bool transparent = false):
+	DialogView(MadsM4Engine *Vm, int x = 0, int y = 0, bool transparent = false):
 		View(Vm, x, y, transparent) {};
 
-	M4Engine *vm() { return _vm; }
+	MadsM4Engine *vm() { return _vm; }
 	virtual SpriteAsset *sprites() = 0;
 	virtual MenuType getMenuType() = 0;
 	virtual MenuObject *getItem(int objectId) { return NULL; }

Modified: scummvm/trunk/engines/m4/hotspot.cpp
===================================================================
--- scummvm/trunk/engines/m4/hotspot.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/hotspot.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -274,10 +274,10 @@
 			currentHotSpot->setVerb("");
 
 			if (currentHotSpot->getVocabID() > 0)
-				currentHotSpot->setVocab(_vm->_globals->getVocab(currentHotSpot->getVocabID()));
+				currentHotSpot->setVocab(_madsVm->_globals->getVocab(currentHotSpot->getVocabID()));
 
 			if (currentHotSpot->getVerbID() > 0)
-				currentHotSpot->setVerb(_vm->_globals->getVocab(currentHotSpot->getVerbID()));
+				currentHotSpot->setVerb(_madsVm->_globals->getVocab(currentHotSpot->getVerbID()));
 		}
 	}
 }

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/m4.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -64,16 +64,18 @@
 namespace M4 {
 
 // FIXME: remove global
-M4Engine *_vm;
+MadsM4Engine *_vm;
+MadsEngine *_madsVm;
+M4Engine *_m4Vm;
 
-void escapeHotkeyHandler(M4Engine *vm, View *view, uint32 key) {
+void escapeHotkeyHandler(MadsM4Engine *vm, View *view, uint32 key) {
 	// For now, simply exit the game
 	vm->_events->quitFlag = true;
 }
 
 // Temporary hotkey handler for use in testing the TextviewView class
 
-void textviewHotkeyHandler(M4Engine *vm, View *view, uint32 key) {
+void textviewHotkeyHandler(MadsM4Engine *vm, View *view, uint32 key) {
 	// Deactivate the scene if it's currently active
 	View *sceneView = vm->_viewManager->getView(VIEWID_SCENE);
 	if (sceneView != NULL)
@@ -86,38 +88,40 @@
 	textView->setScript("quotes", NULL);
 }
 
-void saveGameHotkeyHandler(M4Engine *vm, View *view, uint32 key) {
+void saveGameHotkeyHandler(MadsM4Engine *vm, View *view, uint32 key) {
 	// TODO: See CreateF2SaveMenu - save menu should only be activated when
 	// certain conditions are met, such as player_commands_allowed, and isInterfaceVisible
 	vm->loadMenu(SAVE_MENU, true);
 }
 
-void loadGameHotkeyHandler(M4Engine *vm, View *view, uint32 key) {
+void loadGameHotkeyHandler(MadsM4Engine *vm, View *view, uint32 key) {
 	// TODO: See CreateF3LoadMenu - save menu should only be activated when
 	// certain conditions are met, such as player_commands_allowed, and isInterfaceVisible
 	vm->loadMenu(LOAD_MENU, true);
 }
 
-void gameMenuHotkeyHandler(M4Engine *vm, View *view, uint32 key) {
+void gameMenuHotkeyHandler(MadsM4Engine *vm, View *view, uint32 key) {
 	vm->loadMenu(GAME_MENU);
 }
 
-M4Engine::M4Engine(OSystem *syst, const M4GameDescription *gameDesc) :
+MadsM4Engine::MadsM4Engine(OSystem *syst, const M4GameDescription *gameDesc) :
 	Engine(syst), _gameDescription(gameDesc) {
 
 	// FIXME
 	_vm = this;
+	_madsVm = NULL;
 
 	SearchMan.addSubDirectoryMatching(_gameDataDir, "goodstuf");
 	SearchMan.addSubDirectoryMatching(_gameDataDir, "resource");
 
 	Common::addDebugChannel(kDebugScript, "script", "Script debug level");
 	Common::addDebugChannel(kDebugConversations, "conversations", "Conversations debugging");
+
+	_resourceManager = NULL;
 }
 
 
-M4Engine::~M4Engine() {
-	delete _globals;
+MadsM4Engine::~MadsM4Engine() {
 	delete _midi;
 	delete _saveLoad;
 	delete _kernel;
@@ -138,16 +142,10 @@
 	delete _random;
 	delete _animation;
 	delete _palette;
-	delete _resourceManager;
 }
 
-Common::Error M4Engine::run() {
+Common::Error MadsM4Engine::run() {
 	// Initialize backend
-	if (isM4())
-		initGraphics(640, 480, true);
-	else
-		initGraphics(320, 200, false);
-
 	_screen = new M4Surface(true); // Special form for creating screen reference
 
 	MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
@@ -161,11 +159,6 @@
 	_midi->setGM(true);
 	_midi->setNativeMT32(native_mt32);
 
-	_globals = new Globals(this);
-	if (isM4())
-		_resourceManager = new M4ResourceManager(this);
-	else
-		_resourceManager = new MADSResourceManager(this);
 	_saveLoad = new SaveLoad(this);
 	_palette = new Palette(this);
 	_mouse = new Mouse(this);
@@ -194,13 +187,10 @@
 	_random = new Common::RandomSource();
 	g_eventRec.registerRandomSource(*_random, "m4");
 
-	if (isM4())
-		return goM4();
-	else
-		return goMADS();
+	return Common::kNoError;
 }
 
-void M4Engine::eventHandler() {
+void MadsM4Engine::eventHandler() {
 	M4EventType event;
 	uint32 keycode = 0;
 
@@ -213,7 +203,7 @@
 		_viewManager->handleKeyboardEvents(keycode);
 }
 
-bool M4Engine::delay(int duration, bool keyAborts, bool clickAborts) {
+bool MadsM4Engine::delay(int duration, bool keyAborts, bool clickAborts) {
 	uint32 endTime = g_system->getMillis() + duration;
 	M4EventType event;
 	uint32 keycode = 0;
@@ -234,7 +224,7 @@
 	return false;
 }
 
-void M4Engine::loadMenu(MenuType menuType, bool loadSaveFromHotkey, bool calledFromMainMenu) {
+void MadsM4Engine::loadMenu(MenuType menuType, bool loadSaveFromHotkey, bool calledFromMainMenu) {
 	if (isM4() && (menuType != MAIN_MENU)) {
 		bool menuActive = _viewManager->getView(VIEWID_MENU) != NULL;
 
@@ -272,88 +262,59 @@
 	_viewManager->moveToFront(view);
 }
 
-Common::Error M4Engine::goMADS() {
-	_palette->setMadsSystemPalette();
+void MadsM4Engine::dumpFile(const char* filename, bool uncompress) {
+	Common::SeekableReadStream *fileS = res()->get(filename);
+	byte buffer[256];
+	FILE *destFile = fopen(filename, "wb");
+	int bytesRead = 0;
+	printf("Dumping %s, size: %i\n", filename, fileS->size());
 
-	_mouse->init("cursor.ss", NULL);
-	_mouse->setCursorNum(0);
-
-	// Load MADS data files
-	_globals->loadMadsVocab();			// vocab.dat
-	_globals->loadMadsQuotes();			// quotes.dat
-	_globals->loadMadsMessagesInfo();	// messages.dat
-	_globals->loadMadsObjects();
-
-	// Setup globals
-	_vm->_globals->easyMouse = true;
-	_vm->_globals->invObjectsStill = false;
-	_vm->_globals->textWindowStill = false;
-	_vm->_globals->storyMode = 0;
-
-	// Test code to dump all messages to the console
-	//for (int i = 0; i < _globals->getMessagesSize(); i++)
-	//printf("%s\n----------\n", _globals->loadMessage(i));
-
-	if ((getGameType() == GType_RexNebular) || (getGameType() == GType_DragonSphere)) {
-		loadMenu(MAIN_MENU);
-
+	if (!uncompress) {
+		while (!fileS->eos()) {
+			bytesRead = fileS->read(buffer, 256);
+			fwrite(buffer, bytesRead, 1, destFile);
+		}
 	} else {
-		if (getGameType() == GType_DragonSphere) {
-			_scene->loadScene(FIRST_SCENE);
-		} else if (getGameType() == GType_Phantom) {
-			//_scene->loadScene(FIRST_SCENE);
-			_scene->loadScene(106);		// a more interesting scene
+		MadsPack packData(fileS);
+		Common::MemoryReadStream *sourceUnc;
+		for (int i = 0; i < packData.getCount(); i++) {
+			sourceUnc = packData.getItemStream(i);
+			printf("Dumping compressed chunk %i of %i, size is %i\n", i + 1, packData.getCount(), sourceUnc->size());
+			while (!sourceUnc->eos()) {
+				bytesRead = sourceUnc->read(buffer, 256);
+				fwrite(buffer, bytesRead, 1, destFile);
+			}
+			delete sourceUnc;
 		}
-
-		_scene->show();
-
-		_font->setFont(FONT_MAIN_MADS);
-		_font->setColors(2, 1, 3);
-		_font->writeString(_scene->getBackgroundSurface(), "Testing the M4/MADS ScummVM engine", 5, 160, 310, 2);
-		_font->writeString(_scene->getBackgroundSurface(), "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 5, 180, 310, 2);
-
-		if (getGameType() == GType_DragonSphere) {
-			//_scene->showMADSV2TextBox("Test", 10, 10, NULL);
-		}
-
-		_mouse->cursorOn();
 	}
 
-	_viewManager->systemHotkeys().add(Common::KEYCODE_ESCAPE, &escapeHotkeyHandler);
-	_viewManager->systemHotkeys().add(Common::KEYCODE_KP_MULTIPLY, &textviewHotkeyHandler);
+	fclose(destFile);
+	res()->toss(filename);
+	res()->purge();
+}
 
-	// Load the general game SFX/voices
-	if (getGameType() == GType_RexNebular) {
-		_sound->loadDSRFile("rex009.dsr");
-	} else if (getGameType() == GType_Phantom) {
-		_sound->loadDSRFile("phan009.dsr");
-	} else if (getGameType() == GType_DragonSphere) {
-		_sound->loadDSRFile("drag009.dsr");
-	}
+/*--------------------------------------------------------------------------*/
 
-	uint32 nextFrame = g_system->getMillis();
-	while (!_events->quitFlag) {
-		eventHandler();
+M4Engine::M4Engine(OSystem *syst, const M4GameDescription *gameDesc): MadsM4Engine(syst, gameDesc) {
+	// FIXME
+	_m4Vm = this;
+}
 
-		_animation->updateAnim();
+M4Engine::~M4Engine() {
+	delete _resourceManager;
+}
 
-		// Call the updateState method of all views
-		_viewManager->updateState();
+Common::Error M4Engine::run() {
+	// Set up the graphics mode
+	initGraphics(640, 480, true);
 
-		if (g_system->getMillis() >= nextFrame) {
+	// Necessary pre-initialisation
+	_resourceManager = new M4ResourceManager(this);
 
-			_viewManager->refreshAll();
-			nextFrame = g_system->getMillis();// + GAME_FRAME_DELAY;
-		}
+	// Set up needed common functionality
+	MadsM4Engine::run();
 
-		g_system->delayMillis(10);
-	}
 
-	return Common::kNoError;
-}
-
-Common::Error M4Engine::goM4() {
-
 	_script->open("m4.dat");
 
 #ifdef SCRIPT_TEST
@@ -521,35 +482,108 @@
 	return Common::kNoError;
 }
 
-void M4Engine::dumpFile(const char* filename, bool uncompress) {
-	Common::SeekableReadStream *fileS = res()->get(filename);
-	byte buffer[256];
-	FILE *destFile = fopen(filename, "wb");
-	int bytesRead = 0;
-	printf("Dumping %s, size: %i\n", filename, fileS->size());
+/*--------------------------------------------------------------------------*/
 
-	if (!uncompress) {
-		while (!fileS->eos()) {
-			bytesRead = fileS->read(buffer, 256);
-			fwrite(buffer, bytesRead, 1, destFile);
-		}
+MadsEngine::MadsEngine(OSystem *syst, const M4GameDescription *gameDesc): MadsM4Engine(syst, gameDesc) {
+	// FIXME
+	_madsVm = this;
+
+	_globals = new MadsGlobals(this);
+}
+
+MadsEngine::~MadsEngine() {
+	delete _globals;
+	delete _resourceManager;
+}
+
+Common::Error MadsEngine::run() {
+	// Set up the graphics mode
+	initGraphics(320, 200, false);
+
+	// Necessary pre-initialisation
+	_resourceManager = new MADSResourceManager(this);
+
+	// Set up needed common functionality
+	MadsM4Engine::run();
+
+	_palette->setMadsSystemPalette();
+
+	_mouse->init("cursor.ss", NULL);
+	_mouse->setCursorNum(0);
+
+	// Load MADS data files
+	_globals->loadMadsVocab();			// vocab.dat
+	_globals->loadMadsQuotes();			// quotes.dat
+	_globals->loadMadsMessagesInfo();	// messages.dat
+	_globals->loadMadsObjects();
+
+	// Setup globals
+	_madsVm->_globals->easyMouse = true;
+	_madsVm->_globals->invObjectsStill = false;
+	_madsVm->_globals->textWindowStill = false;
+	_madsVm->_globals->storyMode = 0;
+
+	// Test code to dump all messages to the console
+	//for (int i = 0; i < _globals->getMessagesSize(); i++)
+	//printf("%s\n----------\n", _globals->loadMessage(i));
+
+	if ((getGameType() == GType_RexNebular) || (getGameType() == GType_DragonSphere)) {
+		loadMenu(MAIN_MENU);
+
 	} else {
-		MadsPack packData(fileS);
-		Common::MemoryReadStream *sourceUnc;
-		for (int i = 0; i < packData.getCount(); i++) {
-			sourceUnc = packData.getItemStream(i);
-			printf("Dumping compressed chunk %i of %i, size is %i\n", i + 1, packData.getCount(), sourceUnc->size());
-			while (!sourceUnc->eos()) {
-				bytesRead = sourceUnc->read(buffer, 256);
-				fwrite(buffer, bytesRead, 1, destFile);
-			}
-			delete sourceUnc;
+		if (getGameType() == GType_DragonSphere) {
+			_scene->loadScene(FIRST_SCENE);
+		} else if (getGameType() == GType_Phantom) {
+			//_scene->loadScene(FIRST_SCENE);
+			_scene->loadScene(106);		// a more interesting scene
 		}
+
+		_scene->show();
+
+		_font->setFont(FONT_MAIN_MADS);
+		_font->setColors(2, 1, 3);
+		_font->writeString(_scene->getBackgroundSurface(), "Testing the M4/MADS ScummVM engine", 5, 160, 310, 2);
+		_font->writeString(_scene->getBackgroundSurface(), "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 5, 180, 310, 2);
+
+		if (getGameType() == GType_DragonSphere) {
+			//_scene->showMADSV2TextBox("Test", 10, 10, NULL);
+		}
+
+		_mouse->cursorOn();
 	}
 
-	fclose(destFile);
-	res()->toss(filename);
-	res()->purge();
+	_viewManager->systemHotkeys().add(Common::KEYCODE_ESCAPE, &escapeHotkeyHandler);
+	_viewManager->systemHotkeys().add(Common::KEYCODE_KP_MULTIPLY, &textviewHotkeyHandler);
+
+	// Load the general game SFX/voices
+	if (getGameType() == GType_RexNebular) {
+		_sound->loadDSRFile("rex009.dsr");
+	} else if (getGameType() == GType_Phantom) {
+		_sound->loadDSRFile("phan009.dsr");
+	} else if (getGameType() == GType_DragonSphere) {
+		_sound->loadDSRFile("drag009.dsr");
+	}
+
+	uint32 nextFrame = g_system->getMillis();
+	while (!_events->quitFlag) {
+		eventHandler();
+
+		_animation->updateAnim();
+
+		// Call the updateState method of all views
+		_viewManager->updateState();
+
+		if (g_system->getMillis() >= nextFrame) {
+
+			_viewManager->refreshAll();
+			nextFrame = g_system->getMillis();// + GAME_FRAME_DELAY;
+		}
+
+		g_system->delayMillis(10);
+	}
+
+	return Common::kNoError;
 }
 
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/m4.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -128,7 +128,7 @@
 inline long FixedMul(long a, long b) { return (long)(((float)a * (float)b) / 65536.0); }
 inline long FixedDiv(long a, long b) { return (long)(((float)a / (float)b) * 65536.0); }
 
-class M4Engine : public Engine {
+class MadsM4Engine : public Engine {
 private:
 	Common::Error goMADS();
 	Common::Error goM4();
@@ -142,8 +142,8 @@
 	MidiPlayer *_midi;
 
 public:
-	M4Engine(OSystem *syst, const M4GameDescription *gameDesc);
-	virtual ~M4Engine();
+	MadsM4Engine(OSystem *syst, const M4GameDescription *gameDesc);
+	virtual ~MadsM4Engine();
 
 	int getGameType() const;
 	uint32 getFeatures() const;
@@ -179,7 +179,6 @@
 	ViewManager *_viewManager;
 	Palette *_palette;
 	Kernel *_kernel;
-	Globals *_globals;
 	Player *_player;
 	Mouse *_mouse;
 	Events *_events;
@@ -200,9 +199,29 @@
 	Common::RandomSource *_random;
 };
 
-// FIXME: remove global
-extern M4Engine *_vm;
+class MadsEngine: public MadsM4Engine {
+public:
+	MadsEngine(OSystem *syst, const M4GameDescription *gameDesc);
+	virtual ~MadsEngine();
 
+	virtual Common::Error run();
+
+	MadsGlobals *_globals;
+};
+
+class M4Engine: public MadsM4Engine {
+public:
+	M4Engine(OSystem *syst, const M4GameDescription *gameDesc);
+	virtual ~M4Engine();
+
+	virtual Common::Error run();
+};
+
+// FIXME: remove globals
+extern MadsM4Engine *_vm;
+extern MadsEngine *_madsVm;
+extern M4Engine *_m4Vm;
+
 } // End of namespace M4
 
 #endif

Modified: scummvm/trunk/engines/m4/m4_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_menus.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/m4_menus.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -306,7 +306,7 @@
 
 //--------------------------------------------------------------------------
 
-OrionMenuView::OrionMenuView(M4Engine *Vm, int x, int y, MenuType menuType, bool calledFromMainMenu,
+OrionMenuView::OrionMenuView(MadsM4Engine *Vm, int x, int y, MenuType menuType, bool calledFromMainMenu,
 		bool loadSaveFromHotkey): DialogView(Vm, x, y, true) {
 	_menuType = menuType;
 	_screenType = VIEWID_MENU;
@@ -512,7 +512,7 @@
 }
 
 void OrionMenuView::destroyView() {
-	M4Engine *engine = _vm;
+	MadsM4Engine *engine = _vm;
 	bool interfaceVisible = _interfaceWasVisible;
 	engine->_viewManager->deleteView(this);
 

Modified: scummvm/trunk/engines/m4/m4_menus.h
===================================================================
--- scummvm/trunk/engines/m4/m4_menus.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/m4_menus.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -59,7 +59,7 @@
 	M4Surface *createThumbnail();
 	void destroyView();
 public:
-	OrionMenuView(M4Engine *vm, int x, int y, MenuType menuType, bool calledFromMainMenu,
+	OrionMenuView(MadsM4Engine *vm, int x, int y, MenuType menuType, bool calledFromMainMenu,
 		bool loadSaveFromHotkey);
 	~OrionMenuView();
 	MenuType getMenuType() { return _menuType; }

Modified: scummvm/trunk/engines/m4/m4_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_views.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/m4_views.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -31,7 +31,7 @@
 
 namespace M4 {
 
-GUIInventory::GUIInventory(View *owner, M4Engine *vm, const Common::Rect &bounds, int horizCells,
+GUIInventory::GUIInventory(View *owner, MadsM4Engine *vm, const Common::Rect &bounds, int horizCells,
 		   int vertCells, int cellWidth, int cellHeight, int tag): GUIRect(owner, bounds, tag) {
 
     _vm = vm;
@@ -218,7 +218,7 @@
 
 #define SPR(x) _sprites->getFrame(x)
 
-GameInterfaceView::GameInterfaceView(M4Engine *vm):
+GameInterfaceView::GameInterfaceView(MadsM4Engine *vm):
 		View(vm, Common::Rect(0, vm->_screen->height() - INTERFACE_HEIGHT,
 				vm->_screen->width(), vm->_screen->height())),
 		_statusText(GUITextField(this, Common::Rect(200, 1, 450, 21))),

Modified: scummvm/trunk/engines/m4/m4_views.h
===================================================================
--- scummvm/trunk/engines/m4/m4_views.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/m4_views.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -58,9 +58,9 @@
 	int _scrollPosition;
 	int _highlightedIndex;
 	int _selectedIndex;
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 public:
-	GUIInventory(View *owner, M4Engine *vm, const Common::Rect &bounds,
+	GUIInventory(View *owner, MadsM4Engine *vm, const Common::Rect &bounds,
 				 int horizCells, int vertCells, int cellWidth, int cellHeight, int tag);
 
 	void onRefresh();
@@ -100,7 +100,7 @@
 private:
 	void setHighlightedButton(int index);
 public:
-	GameInterfaceView(M4Engine *vm);
+	GameInterfaceView(MadsM4Engine *vm);
 	~GameInterfaceView();
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);

Modified: scummvm/trunk/engines/m4/mads_anim.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_anim.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/mads_anim.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -34,7 +34,7 @@
 #define TV_NUM_FADE_STEPS 40
 #define TV_FADE_DELAY_MILLI 50
 
-TextviewView::TextviewView(M4Engine *vm):
+TextviewView::TextviewView(MadsM4Engine *vm):
 		View(vm, Common::Rect(0, 0, vm->_screen->width(), vm->_screen->height())),
 		_bgSurface(vm->_screen->width(), MADS_SURFACE_HEIGHT),
 		_textSurface(vm->_screen->width(), MADS_SURFACE_HEIGHT + vm->_font->getHeight() +
@@ -235,7 +235,7 @@
 
 void TextviewView::scriptDone() {
 	TextviewCallback fn = _callback;
-	M4Engine *vm = _vm;
+	MadsM4Engine *vm = _vm;
 
 	// Remove this view from manager and destroy it
 	_vm->_viewManager->deleteView(this);
@@ -439,7 +439,7 @@
 
 //--------------------------------------------------------------------------
 
-AnimviewView::AnimviewView(M4Engine *vm):
+AnimviewView::AnimviewView(MadsM4Engine *vm):
 		View(vm, Common::Rect(0, 0, vm->_screen->width(), vm->_screen->height())),
 		_bgSurface(vm->_screen->width(), MADS_SURFACE_HEIGHT) {
 
@@ -642,7 +642,7 @@
 
 void AnimviewView::scriptDone() {
 	AnimviewCallback fn = _callback;
-	M4Engine *vm = _vm;
+	MadsM4Engine *vm = _vm;
 
 	// Remove this view from manager and destroy it
 	_vm->_viewManager->deleteView(this);
@@ -714,7 +714,7 @@
 	}
 }
 
-AAFile::AAFile(const char *resourceName, M4Engine* vm): MadsPack(resourceName, vm) {
+AAFile::AAFile(const char *resourceName, MadsM4Engine* vm): MadsPack(resourceName, vm) {
 	Common::MemoryReadStream stream1(*getItemStream(1));
 	Common::MemoryReadStream stream2(*getItemStream(2));
 

Modified: scummvm/trunk/engines/m4/mads_anim.h
===================================================================
--- scummvm/trunk/engines/m4/mads_anim.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/mads_anim.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -44,7 +44,7 @@
 	kTransitionCircleIn = 9
 };
 
-typedef void (*TextviewCallback)(M4Engine *vm);
+typedef void (*TextviewCallback)(MadsM4Engine *vm);
 
 class TextviewView: public View {
 private:
@@ -74,7 +74,7 @@
 	void processText();
 	int getParameter(char **paramP);
 public:
-	TextviewView(M4Engine *vm);
+	TextviewView(MadsM4Engine *vm);
 	~TextviewView();
 
 	void setScript(const char *resourceName, TextviewCallback callback);
@@ -85,11 +85,11 @@
 	void updateState();
 };
 
-typedef void (*AnimviewCallback)(M4Engine *vm);
+typedef void (*AnimviewCallback)(MadsM4Engine *vm);
 
 class AAFile: public MadsPack {
 public:
-	AAFile(const char *resourceName, M4Engine* vm);
+	AAFile(const char *resourceName, MadsM4Engine* vm);
 
 	uint16 seriesCount;
 	uint16 frameCount;
@@ -122,7 +122,7 @@
 	void readNextCommand();
 	void processCommand();
 public:
-	AnimviewView(M4Engine *vm);
+	AnimviewView(MadsM4Engine *vm);
 	~AnimviewView();
 
 	void setScript(const char *resourceName, AnimviewCallback callback);

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -45,7 +45,7 @@
 #define DRAGON_MENU_BUTTON_W = 45
 #define DRAGON_MENU_BUTTON_H = 11
 
-RexMainMenuView::RexMainMenuView(M4Engine *vm):
+RexMainMenuView::RexMainMenuView(MadsM4Engine *vm):
 		View(vm, Common::Rect(0, 0, vm->_screen->width(), vm->_screen->height())) {
 
 	_screenType = VIEWID_MAINMENU;
@@ -295,7 +295,7 @@
 }
 
 void RexMainMenuView::handleAction(MadsGameAction action) {
-	M4Engine *vm = _vm;
+	MadsM4Engine *vm = _vm;
 	vm->_mouse->cursorOff();
 	vm->_viewManager->deleteView(this);
 
@@ -344,7 +344,7 @@
 
 //--------------------------------------------------------------------------
 
-MadsMainMenuView::MadsMainMenuView(M4Engine *vm):
+MadsMainMenuView::MadsMainMenuView(MadsM4Engine *vm):
 		View(vm, Common::Rect(0, 0, vm->_screen->width(), vm->_screen->height())) {
 
 }
@@ -359,7 +359,7 @@
 
 //--------------------------------------------------------------------------
 
-DragonMainMenuView::DragonMainMenuView(M4Engine *vm):
+DragonMainMenuView::DragonMainMenuView(MadsM4Engine *vm):
 		View(vm, Common::Rect(0, 0, vm->_screen->width(), vm->_screen->height())) {
 
 	_screenType = VIEWID_MAINMENU;
@@ -548,7 +548,7 @@
 }
 
 void DragonMainMenuView::handleAction(MadsGameAction action) {
-	M4Engine *vm = _vm;
+	MadsM4Engine *vm = _vm;
 	vm->_mouse->cursorOff();
 	vm->_viewManager->deleteView(this);
 

Modified: scummvm/trunk/engines/m4/mads_menus.h
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/mads_menus.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -49,7 +49,7 @@
 	int getHighlightedItem(int x, int y);
 	void handleAction(MadsGameAction action);
 public:
-	RexMainMenuView(M4Engine *vm);
+	RexMainMenuView(MadsM4Engine *vm);
 	~RexMainMenuView();
 
 	bool onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents);
@@ -71,7 +71,7 @@
 	int getHighlightedItem(int x, int y);
 	void handleAction(MadsGameAction action);
 public:
-	DragonMainMenuView(M4Engine *vm);
+	DragonMainMenuView(MadsM4Engine *vm);
 	~DragonMainMenuView();
 
 	bool onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents);
@@ -80,7 +80,7 @@
 
 class MadsMainMenuView: public View {
 public:
-	MadsMainMenuView(M4Engine *vm);
+	MadsMainMenuView(MadsM4Engine *vm);
 
 	bool onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents);
 	void updateState();

Modified: scummvm/trunk/engines/m4/midi.cpp
===================================================================
--- scummvm/trunk/engines/m4/midi.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/midi.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -32,7 +32,7 @@
 
 namespace M4 {
 
-MidiPlayer::MidiPlayer(M4Engine *vm, MidiDriver *driver) : _vm(vm), _midiData(NULL), _driver(driver), _isPlaying(false), _passThrough(false), _isGM(false) {
+MidiPlayer::MidiPlayer(MadsM4Engine *vm, MidiDriver *driver) : _vm(vm), _midiData(NULL), _driver(driver), _isPlaying(false), _passThrough(false), _isGM(false) {
 	memset(_channel, 0, sizeof(_channel));
 	_masterVolume = 0;
 	_parser = MidiParser::createParser_SMF();

Modified: scummvm/trunk/engines/m4/midi.h
===================================================================
--- scummvm/trunk/engines/m4/midi.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/midi.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -36,7 +36,7 @@
 
 class MidiPlayer : public MidiDriver {
 public:
-	MidiPlayer(M4Engine *vm, MidiDriver *driver);
+	MidiPlayer(MadsM4Engine *vm, MidiDriver *driver);
 	~MidiPlayer();
 
 	bool isPlaying() { return _isPlaying; }
@@ -69,7 +69,7 @@
 protected:
 	static void onTimer(void *data);
 
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	byte *_midiData;
 
 	MidiChannel *_channel[16];

Modified: scummvm/trunk/engines/m4/resource.cpp
===================================================================
--- scummvm/trunk/engines/m4/resource.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/resource.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -409,7 +409,7 @@
 
 //--------------------------------------------------------------------------
 
-M4ResourceManager::M4ResourceManager(M4Engine *vm): ResourceManager(vm) {
+M4ResourceManager::M4ResourceManager(MadsM4Engine *vm): ResourceManager(vm) {
 	_hfs = new FileSystem(_vm->getGameFile(kFileTypeHash));
 }
 

Modified: scummvm/trunk/engines/m4/resource.h
===================================================================
--- scummvm/trunk/engines/m4/resource.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/resource.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -90,11 +90,11 @@
 	typedef Common::List<Common::SharedPtr<Resource> > ResourceList;
 	typedef ResourceList::iterator ResourceIterator;
 	ResourceList _resources;
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 
 	virtual Common::SeekableReadStream *loadResource(const char *resourceName, bool loadFlag) = 0;
 public:
-	ResourceManager(M4Engine *vm): _vm(vm) {};
+	ResourceManager(MadsM4Engine *vm): _vm(vm) {};
 	virtual ~ResourceManager();
 
 	Common::SeekableReadStream *get(const char *resourceName, bool loadFlag = true);
@@ -119,7 +119,7 @@
 protected:
 	Common::SeekableReadStream *loadResource(const char *resourceName, bool loadFlag);
 public:
-	MADSResourceManager(M4Engine *vm): ResourceManager(vm) {};
+	MADSResourceManager(MadsM4Engine *vm): ResourceManager(vm) {};
 	bool resourceExists(const char *resourceName);
 };
 
@@ -127,7 +127,7 @@
 protected:
 	Common::SeekableReadStream *loadResource(const char *resourceName, bool loadFlag);
 public:
-	M4ResourceManager(M4Engine *vm);
+	M4ResourceManager(MadsM4Engine *vm);
 	~M4ResourceManager();
 	bool resourceExists(const char *resourceName);
 

Modified: scummvm/trunk/engines/m4/saveload.cpp
===================================================================
--- scummvm/trunk/engines/m4/saveload.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/saveload.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -34,7 +34,7 @@
 
 const char *orionSavesList = "saves.dir";
 
-SaveLoad::SaveLoad(M4Engine *vm) : _vm(vm) {
+SaveLoad::SaveLoad(MadsM4Engine *vm) : _vm(vm) {
 	// For Orion Burger, check the existance of a 'saves.dir' file to determine whether to
 	// act exactly like the original. Otherwise, we'll use the ScummVM standard, where we'll
 	// keep all the data for a savegame in a single file

Modified: scummvm/trunk/engines/m4/saveload.h
===================================================================
--- scummvm/trunk/engines/m4/saveload.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/saveload.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -38,12 +38,12 @@
 
 class SaveLoad {
 private:
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	bool _emulateOriginal;
 
 	const char *generateSaveName(int slotNumber);
 public:
-	SaveLoad(M4Engine *vm);
+	SaveLoad(MadsM4Engine *vm);
 
 	bool hasSaves();
 	SaveGameList *getSaves();

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -44,7 +44,7 @@
 static const int SCROLLER_DELAY = 200;
 
 
-Scene::Scene(M4Engine *vm): View(vm, Common::Rect(0, 0, vm->_screen->width(), vm->_screen->height())) {
+Scene::Scene(MadsM4Engine *vm): View(vm, Common::Rect(0, 0, vm->_screen->width(), vm->_screen->height())) {
 	_screenType = VIEWID_SCENE;
 
 	_sceneResources.hotspots = new HotSpotList();
@@ -393,7 +393,7 @@
 		if (verbId == kVerbNone)
 			verbId = kVerbWalkTo;
 
-		sprintf(statusText, "%s %s\n", _vm->_globals->getVocab(verbId), currentHotSpot->getVocab());
+		sprintf(statusText, "%s %s\n", _madsVm->_globals->getVocab(verbId), currentHotSpot->getVocab());
 
 		statusText[0] = toupper(statusText[0]);	// capitalize first letter
 		setMADSStatusText(statusText);
@@ -535,7 +535,7 @@
 					if (currentHotSpot->getVerbID() != 0) {
 						sprintf(statusText, "%s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab());
 					} else {
-						sprintf(statusText, "%s %s\n", _vm->_globals->getVocab(kVerbWalkTo), currentHotSpot->getVocab());
+						sprintf(statusText, "%s %s\n", _madsVm->_globals->getVocab(kVerbWalkTo), currentHotSpot->getVocab());
 					}
 
 					statusText[0] = toupper(statusText[0]);	// capitalize first letter
@@ -550,8 +550,8 @@
 			_vm->_interfaceView->_inventory.clearSelected();
 		} else {
 			// ***DEBUG*** - sample dialog display
-			int idx = 3; //_vm->_globals->messageIndexOf(0x277a);
-			const char *msg = _vm->_globals->loadMessage(idx);
+			int idx = 3; //_madsVm->_globals->messageIndexOf(0x277a);
+			const char *msg = _madsVm->_globals->loadMessage(idx);
 			Dialog *dlg = new Dialog(_vm, msg, "TEST DIALOG");
 			_vm->_viewManager->addView(dlg);
 			_vm->_viewManager->moveToFront(dlg);
@@ -699,12 +699,12 @@
 	// a second object can be selected, as in 'use gun to shoot person', with requires a target
 
 	// Set up the new action
-	strcpy(statusText, _vm->_globals->getVocab(action));
+	strcpy(statusText, _madsVm->_globals->getVocab(action));
 	statusText[0] = toupper(statusText[0]);	// capitalize first letter
 
 	if (objectId != -1) {
-		MadsObject *obj = _vm->_globals->getObject(objectId);
-		sprintf(statusText + strlen(statusText), " %s", _vm->_globals->getVocab(obj->descId));
+		MadsObject *obj = _madsVm->_globals->getObject(objectId);
+		sprintf(statusText + strlen(statusText), " %s", _madsVm->_globals->getVocab(obj->descId));
 	} else {
 		_currentAction = action;
 	}
@@ -719,7 +719,7 @@
  *--------------------------------------------------------------------------
  */
 
-MadsInterfaceView::MadsInterfaceView(M4Engine *vm): View(vm, Common::Rect(0, MADS_SURFACE_HEIGHT,
+MadsInterfaceView::MadsInterfaceView(MadsM4Engine *vm): View(vm, Common::Rect(0, MADS_SURFACE_HEIGHT,
 														 vm->_screen->width(), vm->_screen->height())) {
 	_screenType = VIEWID_INTERFACE;
 	_highlightedElement = -1;
@@ -772,8 +772,8 @@
 	// Build up the inventory list
 	_inventoryList.clear();
 
-	for (uint i = 0; i < _vm->_globals->getObjectsSize(); ++i) {
-		MadsObject *obj = _vm->_globals->getObject(i);
+	for (uint i = 0; i < _madsVm->_globals->getObjectsSize(); ++i) {
+		MadsObject *obj = _madsVm->_globals->getObject(i);
 		if (obj->roomNumber == PLAYER_INVENTORY)
 			_inventoryList.push_back(i);
 	}
@@ -823,7 +823,7 @@
 
 void MadsInterfaceView::addObjectToInventory(int objectNumber) {
 	if (_inventoryList.indexOf(objectNumber) == -1) {
-		_vm->_globals->getObject(objectNumber)->roomNumber = PLAYER_INVENTORY;
+		_madsVm->_globals->getObject(objectNumber)->roomNumber = PLAYER_INVENTORY;
 		_inventoryList.push_back(objectNumber);
 	}
 
@@ -847,7 +847,7 @@
 				((actionIndex == 0) ? ITEM_SELECTED : ITEM_NORMAL));
 
 			// Get the verb action and capitalise it
-			const char *verbStr = _vm->_globals->getVocab(kVerbLook + actionIndex);
+			const char *verbStr = _madsVm->_globals->getVocab(kVerbLook + actionIndex);
 			strcpy(buffer, verbStr);
 			if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
 
@@ -875,7 +875,7 @@
 		if ((_topIndex + i) >= _inventoryList.size())
 			break;
 
-		const char *descStr = _vm->_globals->getVocab(_vm->_globals->getObject(
+		const char *descStr = _madsVm->_globals->getVocab(_madsVm->_globals->getObject(
 			_inventoryList[_topIndex + i])->descId);
 		strcpy(buffer, descStr);
 		if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
@@ -898,21 +898,21 @@
 		M4Sprite *spr = _objectSprites->getFrame(_objectFrameNumber / INV_ANIM_FRAME_SPEED);
 		spr->copyTo(destSurface, INVENTORY_X, INVENTORY_Y, 0);
 
-		if (!_vm->_globals->invObjectsStill && !dialogVisible) {
+		if (!_madsVm->_globals->invObjectsStill && !dialogVisible) {
 			// If objetcs are to animated, move to the next frame
 			if (++_objectFrameNumber >= (_objectSprites->getCount() * INV_ANIM_FRAME_SPEED))
 				_objectFrameNumber = 0;
 		}
 
 		// List the vocab actions for the currently selected object
-		MadsObject *obj = _vm->_globals->getObject(_selectedObject);
+		MadsObject *obj = _madsVm->_globals->getObject(_selectedObject);
 		int yIndex = MIN(_highlightedElement - VOCAB_START, obj->vocabCount - 1);
 
 		for (int i = 0; i < obj->vocabCount; ++i) {
 			const Common::Rect r(_screenObjects[VOCAB_START + i]);
 
 			// Get the vocab description and capitalise it
-			const char *descStr = _vm->_globals->getVocab(obj->vocabList[i].vocabId);
+			const char *descStr = _madsVm->_globals->getVocab(obj->vocabList[i].vocabId);
 			strcpy(buffer, descStr);
 			if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
 
@@ -958,7 +958,7 @@
 			_vm->_scene->setAction(kVerbLook + (_highlightedElement - ACTIONS_START));
 		} else if ((_highlightedElement >= VOCAB_START) && (_highlightedElement < (VOCAB_START + 5))) {
 			// A vocab action was selected
-			MadsObject *obj = _vm->_globals->getObject(_selectedObject);
+			MadsObject *obj = _madsVm->_globals->getObject(_selectedObject);
 			int vocabIndex = MIN(_highlightedElement - VOCAB_START, obj->vocabCount - 1);
 			if (vocabIndex >= 0)
 				_vm->_scene->setAction(obj->vocabList[vocabIndex].vocabId, _selectedObject);

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/scene.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -79,7 +79,7 @@
 
 class Scene: public View {
 public:
-	Scene(M4Engine *vm);
+	Scene(MadsM4Engine *vm);
 	~Scene();
 
 	// TODO: perhaps move playIntro() someplace else?
@@ -162,7 +162,7 @@
 	bool handleCheatKey(int32 keycode);
 	bool handleKeypress(int32 keycode);
 public:
-	MadsInterfaceView(M4Engine *vm);
+	MadsInterfaceView(MadsM4Engine *vm);
 	~MadsInterfaceView();
 
 	void initialise();

Modified: scummvm/trunk/engines/m4/script.cpp
===================================================================
--- scummvm/trunk/engines/m4/script.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/script.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -217,7 +217,7 @@
 }
 
 
-ScriptInterpreter::ScriptInterpreter(M4Engine *vm) : _scriptFile(NULL), _vm(vm) {
+ScriptInterpreter::ScriptInterpreter(MadsM4Engine *vm) : _scriptFile(NULL), _vm(vm) {
 	initScriptKernel();
 	_dataCache = new ScriptDataCache(this);
 	_runningFunction = NULL;

Modified: scummvm/trunk/engines/m4/script.h
===================================================================
--- scummvm/trunk/engines/m4/script.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/script.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -276,7 +276,7 @@
 
 class ScriptInterpreter {
 public:
-	ScriptInterpreter(M4Engine *vm);
+	ScriptInterpreter(MadsM4Engine *vm);
 	~ScriptInterpreter();
 	/* Opens a M4 program file */
 	void open(const char *filename);
@@ -322,7 +322,7 @@
 
 protected:
 
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 
 	typedef Common::HashMap<Common::String, uint32, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> FunctionNameMap;
 	Common::File *_scriptFile;

Modified: scummvm/trunk/engines/m4/sound.cpp
===================================================================
--- scummvm/trunk/engines/m4/sound.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/sound.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -35,7 +35,7 @@
 
 namespace M4 {
 
-Sound::Sound(M4Engine *vm, Audio::Mixer *mixer, int volume) :
+Sound::Sound(MadsM4Engine *vm, Audio::Mixer *mixer, int volume) :
 	_vm(vm), _mixer(mixer) {
 
 	for (int i = 0; i < SOUND_HANDLES; i++)

Modified: scummvm/trunk/engines/m4/sound.h
===================================================================
--- scummvm/trunk/engines/m4/sound.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/sound.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -68,12 +68,12 @@
 	Common::Array<DSREntry *> dsrEntries;
 };
 
-class M4Engine;
+class MadsM4Engine;
 
 class Sound {
 public:
 
-	Sound(M4Engine *vm, Audio::Mixer *mixer, int volume);
+	Sound(MadsM4Engine *vm, Audio::Mixer *mixer, int volume);
 	~Sound();
 
 	void playSound(const char *soundName, int volume, bool loop, int channel = -1);
@@ -99,7 +99,7 @@
 
  private:
 
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	Audio::Mixer *_mixer;
 	SndHandle _handles[SOUND_HANDLES];
 

Modified: scummvm/trunk/engines/m4/sprite.h
===================================================================
--- scummvm/trunk/engines/m4/sprite.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/sprite.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -106,8 +106,8 @@
 	int xOffset, yOffset;
 	uint8 encoding;
 
-	M4Sprite(M4Engine *vm): M4Surface() {}
-	M4Sprite(M4Engine *vm, int widthVal, int heightVal): M4Surface(widthVal, heightVal), xOffset(0), yOffset(0) {}
+	M4Sprite(MadsM4Engine *vm): M4Surface() {}
+	M4Sprite(MadsM4Engine *vm, int widthVal, int heightVal): M4Surface(widthVal, heightVal), xOffset(0), yOffset(0) {}
 	// Loads a sprite from the given stream, and optionally decompresses the RLE-encoded data
 	M4Sprite(Common::SeekableReadStream* source, int xOfs, int yOfs, int widthVal, int heightVal, bool decodeRle = true, uint8 encodingVal = 0);
 	// Loads an RLE compressed sprite; the surface must have been created before

Modified: scummvm/trunk/engines/m4/viewmgr.cpp
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/viewmgr.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -31,7 +31,7 @@
 
 namespace M4 {
 
-void returnToMainMenuFn(M4Engine *vm) {
+void returnToMainMenuFn(MadsM4Engine *vm) {
 	vm->_palette->resetColorCounts();
 	vm->_palette->setMadsSystemPalette();
 
@@ -105,14 +105,14 @@
 
 // View constructor
 
-View::View(M4Engine *vm, const Common::Rect &viewBounds, bool transparent)
+View::View(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent)
 	: M4Surface(viewBounds.width(), viewBounds.height()), _hotkeys(this), _vm(vm) {
 	SCREEN_FLAGS_DEFAULT;
 	_coords = viewBounds;
 	_transparent = transparent;
 }
 
-View::View(M4Engine *vm, int x, int y, bool transparent)
+View::View(MadsM4Engine *vm, int x, int y, bool transparent)
 	: M4Surface(), _hotkeys(this), _vm(vm) {
 	SCREEN_FLAGS_DEFAULT;
 	_coords.left = x;
@@ -194,7 +194,7 @@
 
 //--------------------------------------------------------------------------
 
-ViewManager::ViewManager(M4Engine *vm): _systemHotkeys(HotkeyList(NULL)), _vm(vm) {
+ViewManager::ViewManager(MadsM4Engine *vm): _systemHotkeys(HotkeyList(NULL)), _vm(vm) {
 	_captureScreen = NULL;
 	_captureEvents = false;
 }

Modified: scummvm/trunk/engines/m4/viewmgr.h
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/viewmgr.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -89,7 +89,7 @@
 
 struct Hotkey {
 public:
-	typedef void (*Callback)(M4Engine *vm, View *view, uint32 key);
+	typedef void (*Callback)(MadsM4Engine *vm, View *view, uint32 key);
 	Hotkey(uint32 keyVal, Hotkey::Callback callbackFn) : key(keyVal), callback(callbackFn) {};
 	uint32 key;
 	Hotkey::Callback callback;
@@ -109,8 +109,8 @@
 
 class View: public M4Surface {
 public:
-	View(M4Engine *vm, const Common::Rect &viewBounds, bool transparent = false);
-	View(M4Engine *vm, int x = 0, int y = 0, bool transparent = false);
+	View(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent = false);
+	View(MadsM4Engine *vm, int x = 0, int y = 0, bool transparent = false);
 	virtual ~View() {}
 
 	void getCoordinates(Common::Rect &rect);
@@ -139,7 +139,7 @@
 	virtual void updateState() {};
 
 protected:
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	Common::Rect _coords;
 	HotkeyList _hotkeys;
 	int _screenType;
@@ -149,7 +149,7 @@
 
 class ViewManager {
 private:
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	HotkeyList _systemHotkeys;
 	Common::List<View *> _views;
 	View *_captureScreen;
@@ -157,7 +157,7 @@
 public:
 	typedef Common::List<View *>::iterator ListIterator;
 
-	ViewManager(M4Engine *vm);
+	ViewManager(MadsM4Engine *vm);
 	~ViewManager();
 
 	void addView(View *view);

Modified: scummvm/trunk/engines/m4/woodscript.cpp
===================================================================
--- scummvm/trunk/engines/m4/woodscript.cpp	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/woodscript.cpp	2010-01-30 09:21:07 UTC (rev 47705)
@@ -153,7 +153,7 @@
 	return true;
 }
 
-WoodScript::WoodScript(M4Engine *vm) {
+WoodScript::WoodScript(MadsM4Engine *vm) {
 	_vm = vm;
 	_machineId = 0;
 	_assets = new AssetManager(vm);

Modified: scummvm/trunk/engines/m4/woodscript.h
===================================================================
--- scummvm/trunk/engines/m4/woodscript.h	2010-01-30 07:11:38 UTC (rev 47704)
+++ scummvm/trunk/engines/m4/woodscript.h	2010-01-30 09:21:07 UTC (rev 47705)
@@ -43,7 +43,7 @@
 
 namespace M4 {
 
-class M4Engine;
+class MadsM4Engine;
 class WoodScript;
 class Machine;
 class Sequence;
@@ -278,7 +278,7 @@
 class WoodScript {
 public:
 
-	WoodScript(M4Engine *vm);
+	WoodScript(MadsM4Engine *vm);
 	~WoodScript();
 
 	Machine *createMachine(int32 machineHash, Sequence *parentSeq, int32 dataHash, int32 dataRowIndex, int callbackHandler, const char *machineName);
@@ -323,7 +323,7 @@
 	byte *getInverseColorTable() const { return _inverseColorTable; }
 
 protected:
-	M4Engine *_vm;
+	MadsM4Engine *_vm;
 	AssetManager *_assets;
 
 	Common::Array<Sequence*> _sequences, _layers;


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

Revision: 47728
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47728&view=rev
Author:   dreammaster
Date:     2010-01-30 23:03:07 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Worked on separating scene logic into separate classes for M4 and MADS

Modified Paths:
--------------
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/dialogs.cpp
    scummvm/trunk/engines/m4/globals.cpp
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/gui.cpp
    scummvm/trunk/engines/m4/hotspot.cpp
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/m4.h
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2010-01-30 19:23:00 UTC (rev 47727)
+++ scummvm/trunk/engines/m4/console.cpp	2010-01-30 23:03:07 UTC (rev 47728)
@@ -311,12 +311,12 @@
 		DebugPrintf("Usage: object ['list' | '#objnum' | 'add #objnum']\n");
 	} else if (!strcmp(argv[1], "list")) {
 		// List of objects
-		for (uint objStart = 0; objStart < _vm->_globals->getObjectsSize(); objStart += 5) {
+		for (uint objStart = 0; objStart < _vm->globals()->getObjectsSize(); objStart += 5) {
 			DebugPrintf("%2d - ", objStart);
-			for (uint objId = objStart; objId < MIN<uint>(_vm->_globals->getObjectsSize(), objStart + 5); ++objId) {
+			for (uint objId = objStart; objId < MIN<uint>(_vm->globals()->getObjectsSize(), objStart + 5); ++objId) {
 				if (objId != objStart) DebugPrintf(", ");
-				uint16 descId = _vm->_globals->getObject(objId)->descId;
-				DebugPrintf("%s", _vm->_globals->getVocab(descId));
+				uint16 descId = _vm->globals()->getObject(objId)->descId;
+				DebugPrintf("%s", _vm->globals()->getVocab(descId));
 			}
 
 			DebugPrintf("\n");
@@ -327,12 +327,12 @@
 		// Add the specified object to the player's inventory
 		int objNum = strToInt(argv[2]);
 
-		if ((objNum < 0) || (objNum >= (int)_vm->_globals->getObjectsSize()))
+		if ((objNum < 0) || (objNum >= (int)_vm->globals()->getObjectsSize()))
 			DebugPrintf("Invalid object specified\n");
 		else if (_vm->isM4())
 			DebugPrintf("Not implemented for M4 games\n");
 		else {
-			_vm->_scene->getMadsInterface()->addObjectToInventory(objNum);
+			_vm->_scene->getInterface()->addObjectToInventory(objNum);
 			return false;
 		}
 
@@ -340,19 +340,19 @@
 		// Print the details of a specific object
 		int objNum = strToInt(argv[1]);
 
-		if ((objNum < 0) || (objNum >= (int)_vm->_globals->getObjectsSize()))
+		if ((objNum < 0) || (objNum >= (int)_vm->globals()->getObjectsSize()))
 			DebugPrintf("Invalid object specified\n");
 		else {
-			const MadsObject *obj = _vm->_globals->getObject(objNum);
+			const MadsObject *obj = _vm->globals()->getObject(objNum);
 
-			DebugPrintf("Object #%d (%s) room=%d article=%d/%s vocabs=%d", objNum, _vm->_globals->getVocab(obj->descId),
+			DebugPrintf("Object #%d (%s) room=%d article=%d/%s vocabs=%d", objNum, _vm->globals()->getVocab(obj->descId),
 				obj->roomNumber, (int)obj->article, englishMADSArticleList[obj->article], obj->vocabCount);
 
 			if (obj->vocabCount > 0) {
 				DebugPrintf(" - ");
 				for (int i = 0; i < obj->vocabCount; ++i) {
 					if (i != 0) DebugPrintf(", ");
-					DebugPrintf("%s (%d)/%d", _vm->_globals->getVocab(obj->vocabList[i].vocabId),
+					DebugPrintf("%s (%d)/%d", _vm->globals()->getVocab(obj->vocabList[i].vocabId),
 						obj->vocabList[i].vocabId, obj->vocabList[i].unk);
 				}
 			}
@@ -371,13 +371,13 @@
 	else {
 		int messageIdx = strToInt(argv[1]);
 		if ((argc == 3) && !strcmp(argv[2], "id"))
-			messageIdx = _vm->_globals->messageIndexOf(messageIdx);
+			messageIdx = _vm->globals()->messageIndexOf(messageIdx);
 
 		if (messageIdx == -1)
 			DebugPrintf("Unknown message");
 		else
 		{
-			const char *msg = _vm->_globals->loadMessage(messageIdx);
+			const char *msg = _vm->globals()->loadMessage(messageIdx);
 			Dialog *dlg = new Dialog(_vm, msg, "TEST DIALOG");
 
 			_vm->_viewManager->addView(dlg);

Modified: scummvm/trunk/engines/m4/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/m4/dialogs.cpp	2010-01-30 19:23:00 UTC (rev 47727)
+++ scummvm/trunk/engines/m4/dialogs.cpp	2010-01-30 23:03:07 UTC (rev 47728)
@@ -191,7 +191,7 @@
  */
 void Dialog::getVocab(int vocabId, char **line) {
 	assert(vocabId > 0);
-	const char *vocabStr = _madsVm->_globals->getVocab(vocabId);
+	const char *vocabStr = _madsVm->globals()->getVocab(vocabId);
 	strcpy(*line, vocabStr);
 
 	if (_commandCase)

Modified: scummvm/trunk/engines/m4/globals.cpp
===================================================================
--- scummvm/trunk/engines/m4/globals.cpp	2010-01-30 19:23:00 UTC (rev 47727)
+++ scummvm/trunk/engines/m4/globals.cpp	2010-01-30 23:03:07 UTC (rev 47728)
@@ -265,11 +265,21 @@
 	// TODO: A proper implementation of game unpausing
 }
 
-//--------------------------------------------------------------------------
+/*--------------------------------------------------------------------------*/
 
-MadsGlobals::MadsGlobals(MadsM4Engine *vm): _vm(vm) {
+Globals::Globals(MadsM4Engine *vm): _vm(vm) {
 }
 
+bool Globals::isInterfaceVisible() {
+	return _vm->_interfaceView->isVisible();
+}
+
+/*--------------------------------------------------------------------------*/
+
+MadsGlobals::MadsGlobals(MadsEngine *vm): Globals(vm) {
+	_vm = vm;
+}
+
 MadsGlobals::~MadsGlobals() {
 	uint32 i;
 
@@ -284,10 +294,6 @@
 	_madsMessages.clear();
 }
 
-bool MadsGlobals::isInterfaceVisible() {
-	return _vm->_interfaceView->isVisible();
-}
-
 void MadsGlobals::loadMadsVocab() {
 	Common::SeekableReadStream *vocabS = _vm->res()->get("vocab.dat");
 	int curPos = 0;
@@ -402,8 +408,14 @@
 	return (char*)buffer;
 }
 
-//--------------------------------------------------------------------------
+/*--------------------------------------------------------------------------*/
 
+M4Globals::M4Globals(M4Engine *vm): Globals(vm) {
+	_vm = vm;
+}
+
+/*--------------------------------------------------------------------------*/
+
 Player::Player(MadsM4Engine *vm) : _vm(vm) {
 	commandsAllowed = true;
 	needToWalk = false;

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2010-01-30 19:23:00 UTC (rev 47727)
+++ scummvm/trunk/engines/m4/globals.h	2010-01-30 23:03:07 UTC (rev 47728)
@@ -36,6 +36,8 @@
 namespace M4 {
 
 class MadsM4Engine;
+class M4Engine;
+class MadsEngine;
 class ScriptInterpreter;
 class ScriptFunction;
 
@@ -183,8 +185,29 @@
 
 typedef Common::Array<Common::SharedPtr<MadsObject> > MadsObjectArray;
 
-class MadsGlobals {
+class Globals {
 private:
+	MadsM4Engine *_vm;
+public:
+	Globals(MadsM4Engine *vm);
+	virtual ~Globals() {};
+
+	bool isInterfaceVisible();
+
+};
+
+class M4Globals: public Globals {
+private:
+	M4Engine *_vm;
+public:
+	M4Globals(M4Engine *vm);
+	virtual ~M4Globals() {};
+
+	bool invSuppressClickSound;
+};
+
+class MadsGlobals: public Globals {
+private:
 	struct MessageItem {
 		uint32 id;
 		uint32 offset;
@@ -192,18 +215,15 @@
 		uint16 compSize;
 	};
 
-	MadsM4Engine *_vm;
+	MadsEngine *_vm;
 	Common::Array<char* > _madsVocab;
 	Common::Array<char* > _madsQuotes;
 	Common::Array<MessageItem* > _madsMessages;
 	MadsObjectArray _madsObjects;
 public:
-	MadsGlobals(MadsM4Engine *vm);
+	MadsGlobals(MadsEngine *vm);
 	~MadsGlobals();
-	bool isInterfaceVisible();
 
-	// M4 variables
-	bool invSuppressClickSound;
 	// MADS variables
 	bool easyMouse;
 	bool invObjectsStill;

Modified: scummvm/trunk/engines/m4/gui.cpp
===================================================================
--- scummvm/trunk/engines/m4/gui.cpp	2010-01-30 19:23:00 UTC (rev 47727)
+++ scummvm/trunk/engines/m4/gui.cpp	2010-01-30 23:03:07 UTC (rev 47728)
@@ -1191,7 +1191,8 @@
 				_buttonState = BUTTON_PRESSED;
 			}
 
-			_madsVm->_globals->invSuppressClickSound = false;
+			if (_vm->isM4())
+				_m4Vm->globals()->invSuppressClickSound = false;
 		} else {
 			// Button isn't pressed
 			if (_tracking)

Modified: scummvm/trunk/engines/m4/hotspot.cpp
===================================================================
--- scummvm/trunk/engines/m4/hotspot.cpp	2010-01-30 19:23:00 UTC (rev 47727)
+++ scummvm/trunk/engines/m4/hotspot.cpp	2010-01-30 23:03:07 UTC (rev 47728)
@@ -274,10 +274,10 @@
 			currentHotSpot->setVerb("");
 
 			if (currentHotSpot->getVocabID() > 0)
-				currentHotSpot->setVocab(_madsVm->_globals->getVocab(currentHotSpot->getVocabID()));
+				currentHotSpot->setVocab(_madsVm->globals()->getVocab(currentHotSpot->getVocabID()));
 
 			if (currentHotSpot->getVerbID() > 0)
-				currentHotSpot->setVerb(_madsVm->_globals->getVocab(currentHotSpot->getVerbID()));
+				currentHotSpot->setVerb(_madsVm->globals()->getVocab(currentHotSpot->getVerbID()));
 		}
 	}
 }

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2010-01-30 19:23:00 UTC (rev 47727)
+++ scummvm/trunk/engines/m4/m4.cpp	2010-01-30 23:03:07 UTC (rev 47728)
@@ -118,6 +118,7 @@
 	Common::addDebugChannel(kDebugConversations, "conversations", "Conversations debugging");
 
 	_resourceManager = NULL;
+	_globals = NULL;
 }
 
 
@@ -174,7 +175,6 @@
 		_actor = NULL;
 	}
 	_rails = new Rails();	// needs to be initialized before _scene
-	_scene = new Scene(this);
 	_dialogs = new Dialogs();
 	_viewManager = new ViewManager(this);
 	_inventory = new Inventory(this);
@@ -298,10 +298,13 @@
 M4Engine::M4Engine(OSystem *syst, const M4GameDescription *gameDesc): MadsM4Engine(syst, gameDesc) {
 	// FIXME
 	_m4Vm = this;
+
+	_globals = new M4Globals(this);
 }
 
 M4Engine::~M4Engine() {
 	delete _resourceManager;
+	delete _globals;
 }
 
 Common::Error M4Engine::run() {
@@ -314,7 +317,7 @@
 	// Set up needed common functionality
 	MadsM4Engine::run();
 
-
+	_scene = new M4Scene(this);
 	_script->open("m4.dat");
 
 #ifdef SCRIPT_TEST
@@ -506,22 +509,24 @@
 	// Set up needed common functionality
 	MadsM4Engine::run();
 
+	_scene = new MadsScene(this);
 	_palette->setMadsSystemPalette();
 
 	_mouse->init("cursor.ss", NULL);
 	_mouse->setCursorNum(0);
 
 	// Load MADS data files
-	_globals->loadMadsVocab();			// vocab.dat
-	_globals->loadMadsQuotes();			// quotes.dat
-	_globals->loadMadsMessagesInfo();	// messages.dat
-	_globals->loadMadsObjects();
+	MadsGlobals *globals = (MadsGlobals *)_globals;
+	globals->loadMadsVocab();			// vocab.dat
+	globals->loadMadsQuotes();			// quotes.dat
+	globals->loadMadsMessagesInfo();	// messages.dat
+	globals->loadMadsObjects();
 
 	// Setup globals
-	_madsVm->_globals->easyMouse = true;
-	_madsVm->_globals->invObjectsStill = false;
-	_madsVm->_globals->textWindowStill = false;
-	_madsVm->_globals->storyMode = 0;
+	globals->easyMouse = true;
+	globals->invObjectsStill = false;
+	globals->textWindowStill = false;
+	globals->storyMode = 0;
 
 	// Test code to dump all messages to the console
 	//for (int i = 0; i < _globals->getMessagesSize(); i++)

Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h	2010-01-30 19:23:00 UTC (rev 47727)
+++ scummvm/trunk/engines/m4/m4.h	2010-01-30 23:03:07 UTC (rev 47728)
@@ -175,6 +175,8 @@
 	//
 
 	ResourceManager *_resourceManager;
+	Globals *_globals;
+
 	SaveLoad *_saveLoad;
 	ViewManager *_viewManager;
 	Palette *_palette;
@@ -206,7 +208,8 @@
 
 	virtual Common::Error run();
 
-	MadsGlobals *_globals;
+	MadsGlobals *globals() { return (MadsGlobals *)_globals; };
+	MadsScene *scene() { return (MadsScene *)_scene; };
 };
 
 class M4Engine: public MadsM4Engine {
@@ -215,6 +218,9 @@
 	virtual ~M4Engine();
 
 	virtual Common::Error run();
+
+	M4Globals *globals() { return (M4Globals *)_globals; };
+	M4Scene *scene() { return (M4Scene *)_scene; };
 };
 
 // FIXME: remove globals

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-01-30 19:23:00 UTC (rev 47727)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-01-30 23:03:07 UTC (rev 47728)
@@ -52,14 +52,12 @@
 	_sceneResources.props = new HotSpotList();
 	_backgroundSurface = new M4Surface();
 	_codeSurface = new M4Surface();
-	_madsInterfaceSurface = new MadsInterfaceView(vm);
-	_sceneSprites = NULL;
 	_palData = NULL;
 	_interfacePal = NULL;
+	_interfaceSurface = NULL;
 	_inverseColorTable = NULL;
 	strcpy(_statusText, "");
 	_vm->_rails->setCodeSurface(_codeSurface);
-	_currentAction = kVerbNone;
 }
 
 Scene::~Scene() {
@@ -73,7 +71,6 @@
 
 	delete _backgroundSurface;
 	delete _codeSurface;
-	delete _sceneSprites;
 
 //	_vm->_palette->deleteAllRanges();
 
@@ -85,17 +82,6 @@
 void Scene::loadScene(int sceneNumber) {
 	_currentScene = sceneNumber;
 
-	// Close the menu if it's active
-	if (!_vm->isM4()) {
-		View *mainMenu = _vm->_viewManager->getView(VIEWID_MAINMENU);
-		if (mainMenu != NULL) {
-			_vm->_viewManager->deleteView(mainMenu);
-		}
-	}
-
-	// TODO: Check if we were loading a game
-
-
 	// Load scene background and set palette
 	if (_palData) {
 		_vm->_palette->deleteRange(_palData);
@@ -106,79 +92,10 @@
 		_vm->_palette->deleteRange(_interfacePal);
 		delete _interfacePal;
 	}
+}
 
-	if (_vm->isM4()) {
-		_backgroundSurface->loadBackground(sceneNumber);
-		_palData = NULL;
-	} else {
-		// Set system palette entries
-		_vm->_palette->blockRange(0, 7);
-		RGB8 sysColors[3] = { {0x1f<<2, 0x2d<<2, 0x31<<2, 0}, {0x24<<2, 0x37<<2, 0x3a<<2, 0},
-			{0x00<<2, 0x10<<2, 0x16<<2, 0}};
-		_vm->_palette->setPalette(&sysColors[0], 4, 3);
-
-		_backgroundSurface->loadBackground(sceneNumber, &_palData);
-		_vm->_palette->addRange(_palData);
-		_backgroundSurface->translate(_palData);
-
-		if (sceneNumber < 900) {
-			/*_backgroundSurface->fillRect(Common::Rect(0, MADS_SURFACE_HEIGHT,
-				_backgroundSurface->width(), _backgroundSurface->height()),
-				_vm->_palette->BLACK);*/
-			// TODO: interface palette
-			_madsInterfaceSurface->madsloadInterface(0, &_interfacePal);
-			_vm->_palette->addRange(_interfacePal);
-			_madsInterfaceSurface->translate(_interfacePal);
-			_backgroundSurface->copyFrom(_madsInterfaceSurface, Common::Rect(0, 0, 320, 44), 0, 200 - 44);
-
-			_madsInterfaceSurface->initialise();
-		}
-	}
-
-	if (_vm->getGameType() == GType_Burger &&
-		sceneNumber != TITLE_SCENE_BURGER && sceneNumber != MAINMENU_SCENE_BURGER)
-		_vm->_interfaceView->setStatusText("");
-
-	// Load scene def file (*.CHK)
-	if (_vm->isM4()) {
-		loadSceneResources(sceneNumber);
-		loadSceneInverseColorTable(sceneNumber);
-	} else {
-		// Don't load other screen resources for system screens
-		if (sceneNumber >= 900)
-			return;
-
-		loadSceneHotSpotsMads(sceneNumber);
-	}
-
-	// TODO: set walker scaling
-	// TODO: destroy woodscript buffer
-
-	// Load scene walk path file (*.COD/*.WW?)
-	loadSceneCodes(sceneNumber);
-
-	// Load inverse color table file (*.IPL)
-	loadSceneInverseColorTable(sceneNumber);
-
-	if (_vm->isM4()) {
-
-		if (_vm->getGameType() != GType_Burger) {
-			// Load scene sprites file (*.SSB)
-			loadSceneSprites(sceneNumber);
-
-			// Load scene sprite codes file (*.SSC)
-			loadSceneSpriteCodes(sceneNumber);
-		}
-
-
-		if (sceneNumber != TITLE_SCENE_BURGER && sceneNumber != MAINMENU_SCENE_BURGER) {
-			_vm->_interfaceView->show();
-			showSprites();
-		}
-	}
-
-	// Purge resources
-	_vm->res()->purge();
+void Scene::show() {
+	_vm->_viewManager->addView(this);
 }
 
 void Scene::loadSceneResources(int sceneNumber) {
@@ -248,27 +165,6 @@
 	delete hotspotStream;
 }
 
-void Scene::loadSceneCodes(int sceneNumber, int index) {
-	char filename[kM4MaxFilenameSize];
-	Common::SeekableReadStream *sceneS;
-
-	if (_vm->isM4()) {
-		sprintf(filename, "%i.cod", sceneNumber);
-		sceneS = _vm->res()->openFile(filename);
-		_codeSurface->loadCodesM4(sceneS);
-		_vm->res()->toss(filename);
-	} else if (_vm->getGameType() == GType_Phantom || _vm->getGameType() == GType_DragonSphere) {
-		sprintf(filename, "rm%i.ww%i", sceneNumber, index);
-		MadsPack walkData(filename, _vm);
-		sceneS = walkData.getItemStream(0);
-		_codeSurface->loadCodesMads(sceneS);
-		_vm->res()->toss(filename);
-	} else if (_vm->getGameType() == GType_RexNebular) {
-		// TODO
-		return;
-	}
-}
-
 void Scene::loadSceneInverseColorTable(int sceneNumber) {
 	char filename[kM4MaxFilenameSize];
 	Common::SeekableReadStream *iplS;
@@ -287,18 +183,6 @@
 
 }
 
-
-void Scene::loadSceneSprites(int sceneNumber) {
-	char filename[kM4MaxFilenameSize];
-	sprintf(filename, "%i.ssb", sceneNumber);
-
-	Common::SeekableReadStream *sceneS = _vm->res()->get(filename);
-	_sceneSprites = new SpriteAsset(_vm, sceneS, sceneS->size(), filename);
-	_vm->res()->toss(filename);
-
-	printf("Scene has %d sprites, each one having %d colors\n", _sceneSprites->getCount(), _sceneSprites->getColorCount());
-}
-
 void Scene::loadSceneSpriteCodes(int sceneNumber) {
 	char filename[kM4MaxFilenameSize];
 	sprintf(filename, "%i.ssc", sceneNumber);
@@ -349,60 +233,6 @@
 	// TODO
 }
 
-void Scene::checkHotspotAtMousePos(int x, int y) {
-	if (_vm->getGameType() == GType_Riddle)
-		return;
-
-	// TODO: loads of things to do here, only the mouse cursor and the status
-	// text is changed for now
-
-	// Only scene hotspots are checked for now, not parallax/props, as the
-	// latter ones are not used by Orion Burger
-	HotSpot *currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
-	if (currentHotSpot != NULL && currentHotSpot->getActive()) {
-		if (_vm->_mouse->getCursorNum() != CURSOR_LOOK &&
-			_vm->_mouse->getCursorNum() != CURSOR_TAKE &&
-			_vm->_mouse->getCursorNum() != CURSOR_USE &&
-			_vm->_interfaceView->_inventory.getSelectedIndex() == -1) {
-			_vm->_mouse->setCursorNum(currentHotSpot->getCursor());
-		}
-		_vm->_interfaceView->setStatusText(currentHotSpot->getPrep());
-	} else {
-		if (_vm->_mouse->getCursorNum() != CURSOR_LOOK &&
-			_vm->_mouse->getCursorNum() != CURSOR_TAKE &&
-			_vm->_mouse->getCursorNum() != CURSOR_USE &&
-			_vm->_interfaceView->_inventory.getSelectedIndex() == -1) {
-			_vm->_mouse->setCursorNum(0);
-		} else {
-
-		}
-	}
-}
-
-void Scene::checkHotspotAtMousePosMads(int x, int y) {
-	HotSpot *currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
-	if (currentHotSpot != NULL) {
-		_vm->_mouse->setCursorNum(currentHotSpot->getCursor());
-
-		// This is the "easy" interface, which updates the status text when the mouse is moved
-		// TODO: toggle this code for easy/normal interface mode
-		char statusText[50];
-		int verbId = _currentAction;
-		if (verbId == kVerbNone)
-			verbId = currentHotSpot->getVerbID();
-		if (verbId == kVerbNone)
-			verbId = kVerbWalkTo;
-
-		sprintf(statusText, "%s %s\n", _madsVm->_globals->getVocab(verbId), currentHotSpot->getVocab());
-
-		statusText[0] = toupper(statusText[0]);	// capitalize first letter
-		setMADSStatusText(statusText);
-	} else {
-		_vm->_mouse->setCursorNum(0);
-		setMADSStatusText("");
-	}
-}
-
 // Test function, shows all scene hotspots
 void Scene::showHotSpots() {
 	int i = 0;
@@ -450,11 +280,6 @@
 
 }
 
-void Scene::show() {
-	_vm->_viewManager->addView(this);
-	_vm->_viewManager->addView(_madsInterfaceSurface);
-}
-
 void Scene::update() {
 	// TODO: Needs a proper implementation
 	// NOTE: Don't copy the background when in M4 mode or WoodScript anims won't be shown
@@ -473,7 +298,7 @@
 			_vm->_font->writeString(this, _statusText, (width() - _vm->_font->getWidth(_statusText)) / 2, 142, 0);
 		}
 
-		_madsInterfaceSurface->copyTo(this, 0, this->height() - _madsInterfaceSurface->height());
+		_interfaceSurface->copyTo(this, 0, this->height() - _interfaceSurface->height());
 	}
 }
 
@@ -492,76 +317,13 @@
 
 	switch (eventType) {
 	case MEVENT_LEFT_CLICK:
-		{
-			if (_vm->getGameType() == GType_Burger) {
-				// Place a Wilbur sprite with the correct facing
-				HotSpot	*currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
-				if (currentHotSpot != NULL && currentHotSpot->getActive()) {
-					update();
-					_vm->_actor->setWalkerDirection(currentHotSpot->getFacing());
-					/*
-					int posX = currentHotSpot->getFeetX();
-					int posY = currentHotSpot->getFeetY() -
-							   scaleValue(_vm->_actor->getWalkerHeight(), _vm->_actor->getWalkerScaling(), 0);
-					//_vm->_actor->placeWalkerSpriteAt(0, posX, posY);
-					*/
-
-					// Player said.... (for scene scripts)
-					printf("Player said: %s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab());
-
-					// FIXME: This should be moved somewhere else, and is incomplete
-					if (_vm->_interfaceView->_inventory.getSelectedIndex() == -1) {
-						if (_vm->_mouse->getVerb() == NULL) {
-							strcpy(_vm->_player->verb, currentHotSpot->getVerb());
-						} else {
-							strcpy(_vm->_player->verb, _vm->_mouse->getVerb());
-						}
-					} else {
-						strcpy(_vm->_player->verb, _vm->_interfaceView->_inventory.getSelectedObjectName());
-					}
-					strcpy(_vm->_player->noun, currentHotSpot->getVocab());
-					strcpy(_vm->_player->object, "");
-					_vm->_player->commandReady = true;
-
-					printf("## Player said: %s %s\n", _vm->_player->verb, _vm->_player->noun);
-
-				}
-			}
-
-			if (!_vm->isM4()) {
-				HotSpot *currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
-				if (currentHotSpot != NULL) {
-					char statusText[50];
-					if (currentHotSpot->getVerbID() != 0) {
-						sprintf(statusText, "%s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab());
-					} else {
-						sprintf(statusText, "%s %s\n", _madsVm->_globals->getVocab(kVerbWalkTo), currentHotSpot->getVocab());
-					}
-
-					statusText[0] = toupper(statusText[0]);	// capitalize first letter
-					setMADSStatusText(statusText);
-				}
-			}
-		}
+		leftClick(x, y);
 		break;
 	case MEVENT_RIGHT_CLICK:
-		if (_vm->getGameType() == GType_Burger) {
-			nextCommonCursor();
-			_vm->_interfaceView->_inventory.clearSelected();
-		} else {
-			// ***DEBUG*** - sample dialog display
-			int idx = 3; //_madsVm->_globals->messageIndexOf(0x277a);
-			const char *msg = _madsVm->_globals->loadMessage(idx);
-			Dialog *dlg = new Dialog(_vm, msg, "TEST DIALOG");
-			_vm->_viewManager->addView(dlg);
-			_vm->_viewManager->moveToFront(dlg);
-		}
+		rightClick(x, y);
 		break;
 	case MEVENT_MOVE:
-		if (_vm->isM4())
-			checkHotspotAtMousePos(x, y);
-		else
-			checkHotspotAtMousePosMads(x, y);
+		checkHotspotAtMousePos(x, y);
 		break;
 	default:
 		return false;
@@ -570,29 +332,6 @@
 	return true;
 }
 
-void Scene::nextCommonCursor() {
-	int cursorIndex = _vm->_mouse->getCursorNum();
-
-	switch (cursorIndex) {
-	case CURSOR_ARROW:
-		cursorIndex = CURSOR_LOOK;
-		break;
-	case CURSOR_LOOK:
-		cursorIndex = CURSOR_TAKE;
-		break;
-	case CURSOR_TAKE:
-		cursorIndex = CURSOR_USE;
-		break;
-	case CURSOR_USE:
-		cursorIndex = CURSOR_ARROW;
-		break;
-	default:
-		cursorIndex = CURSOR_ARROW;
-	}
-
-	_vm->_mouse->setCursorNum(cursorIndex);
-}
-
 enum boxSprites {
 	topLeft = 0,
 	topRight = 1,
@@ -691,7 +430,313 @@
 	boxSprites->getFrame(bottomRight)->copyTo(_backgroundSurface, curX, curY + 1);
 }
 
-void Scene::setAction(int action, int objectId) {
+/*--------------------------------------------------------------------------*/
+
+M4Scene::M4Scene(M4Engine *vm): Scene(vm) {
+	_vm = vm;
+	_sceneSprites = NULL;
+}
+
+M4Scene::~M4Scene() {
+	delete _sceneSprites;
+}
+
+void M4Scene::loadSceneSprites(int sceneNumber) {
+	char filename[kM4MaxFilenameSize];
+	sprintf(filename, "%i.ssb", sceneNumber);
+
+	Common::SeekableReadStream *sceneS = _vm->res()->get(filename);
+	_sceneSprites = new SpriteAsset(_vm, sceneS, sceneS->size(), filename);
+	_vm->res()->toss(filename);
+
+	printf("Scene has %d sprites, each one having %d colors\n", _sceneSprites->getCount(), _sceneSprites->getColorCount());
+}
+
+void M4Scene::loadScene(int sceneNumber) {
+	Scene::loadScene(sceneNumber);
+
+	_backgroundSurface->loadBackground(sceneNumber);
+	_palData = NULL;
+
+	if (_vm->getGameType() == GType_Burger &&
+			sceneNumber != TITLE_SCENE_BURGER && sceneNumber != MAINMENU_SCENE_BURGER)
+		_vm->_interfaceView->setStatusText("");
+
+	// Load scene def file (*.CHK)
+	loadSceneResources(sceneNumber);
+	loadSceneInverseColorTable(sceneNumber);
+
+	// TODO: set walker scaling
+	// TODO: destroy woodscript buffer
+
+	// Load scene walk path file (*.COD/*.WW?)
+	loadSceneCodes(sceneNumber);
+
+	// Load inverse color table file (*.IPL)
+	loadSceneInverseColorTable(sceneNumber);
+
+	if (_vm->getGameType() != GType_Burger) {
+		// Load scene sprites file (*.SSB)
+		loadSceneSprites(sceneNumber);
+
+		// Load scene sprite codes file (*.SSC)
+		loadSceneSpriteCodes(sceneNumber);
+	}
+
+
+	if (sceneNumber != TITLE_SCENE_BURGER && sceneNumber != MAINMENU_SCENE_BURGER) {
+		_vm->_interfaceView->show();
+		showSprites();
+	}
+
+	// Purge resources
+	_vm->res()->purge();
+}
+
+void M4Scene::loadSceneCodes(int sceneNumber, int index) {
+	char filename[kM4MaxFilenameSize];
+	Common::SeekableReadStream *sceneS;
+
+	sprintf(filename, "%i.cod", sceneNumber);
+	sceneS = _vm->res()->openFile(filename);
+	_codeSurface->loadCodesM4(sceneS);
+	_vm->res()->toss(filename);
+}
+
+void M4Scene::checkHotspotAtMousePos(int x, int y) {
+	if (_vm->getGameType() == GType_Riddle)
+		return;
+
+	// TODO: loads of things to do here, only the mouse cursor and the status
+	// text is changed for now
+
+	// Only scene hotspots are checked for now, not parallax/props, as the
+	// latter ones are not used by Orion Burger
+	HotSpot *currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
+	if (currentHotSpot != NULL && currentHotSpot->getActive()) {
+		if (_vm->_mouse->getCursorNum() != CURSOR_LOOK &&
+			_vm->_mouse->getCursorNum() != CURSOR_TAKE &&
+			_vm->_mouse->getCursorNum() != CURSOR_USE &&
+			_vm->_interfaceView->_inventory.getSelectedIndex() == -1) {
+			_vm->_mouse->setCursorNum(currentHotSpot->getCursor());
+		}
+		_vm->_interfaceView->setStatusText(currentHotSpot->getPrep());
+	} else {
+		if (_vm->_mouse->getCursorNum() != CURSOR_LOOK &&
+			_vm->_mouse->getCursorNum() != CURSOR_TAKE &&
+			_vm->_mouse->getCursorNum() != CURSOR_USE &&
+			_vm->_interfaceView->_inventory.getSelectedIndex() == -1) {
+			_vm->_mouse->setCursorNum(0);
+		} else {
+
+		}
+	}
+}
+
+void M4Scene::leftClick(int x, int y) {
+	if (_vm->getGameType() == GType_Burger) {
+		// Place a Wilbur sprite with the correct facing
+		HotSpot	*currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
+		if (currentHotSpot != NULL && currentHotSpot->getActive()) {
+			update();
+			_vm->_actor->setWalkerDirection(currentHotSpot->getFacing());
+			/*
+			int posX = currentHotSpot->getFeetX();
+			int posY = currentHotSpot->getFeetY() -
+					   scaleValue(_vm->_actor->getWalkerHeight(), _vm->_actor->getWalkerScaling(), 0);
+			//_vm->_actor->placeWalkerSpriteAt(0, posX, posY);
+			*/
+
+			// Player said.... (for scene scripts)
+			printf("Player said: %s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab());
+
+			// FIXME: This should be moved somewhere else, and is incomplete
+			if (_vm->_interfaceView->_inventory.getSelectedIndex() == -1) {
+				if (_vm->_mouse->getVerb() == NULL) {
+					strcpy(_vm->_player->verb, currentHotSpot->getVerb());
+				} else {
+					strcpy(_vm->_player->verb, _vm->_mouse->getVerb());
+				}
+			} else {
+				strcpy(_vm->_player->verb, _vm->_interfaceView->_inventory.getSelectedObjectName());
+			}
+			strcpy(_vm->_player->noun, currentHotSpot->getVocab());
+			strcpy(_vm->_player->object, "");
+			_vm->_player->commandReady = true;
+
+			printf("## Player said: %s %s\n", _vm->_player->verb, _vm->_player->noun);
+
+		}
+	}
+}
+
+void M4Scene::rightClick(int x, int y) {
+	if (_vm->getGameType() == GType_Burger) {
+		nextCommonCursor();
+		_vm->_interfaceView->_inventory.clearSelected();
+	}
+}
+
+void M4Scene::setAction(int action, int objectId) {
+}
+
+void M4Scene::nextCommonCursor() {
+	int cursorIndex = _vm->_mouse->getCursorNum();
+
+	switch (cursorIndex) {
+	case CURSOR_ARROW:
+		cursorIndex = CURSOR_LOOK;
+		break;
+	case CURSOR_LOOK:
+		cursorIndex = CURSOR_TAKE;
+		break;
+	case CURSOR_TAKE:
+		cursorIndex = CURSOR_USE;
+		break;
+	case CURSOR_USE:
+		cursorIndex = CURSOR_ARROW;
+		break;
+	default:
+		cursorIndex = CURSOR_ARROW;
+	}
+
+	_vm->_mouse->setCursorNum(cursorIndex);
+}
+
+/*--------------------------------------------------------------------------*/
+
+MadsScene::MadsScene(MadsEngine *vm): Scene(vm) {
+	_vm = vm;
+
+	_interfaceSurface = new MadsInterfaceView(vm);
+	_currentAction = kVerbNone;
+}
+
+void MadsScene::loadScene(int sceneNumber) {
+	// Close the menu if it's active
+	View *mainMenu = _vm->_viewManager->getView(VIEWID_MAINMENU);
+	if (mainMenu != NULL) {
+		_vm->_viewManager->deleteView(mainMenu);
+	}
+
+	// Handle common scene setting
+	Scene::loadScene(sceneNumber);
+
+
+	// TODO: Check if we were loading a game
+
+
+	// Set system palette entries
+	_vm->_palette->blockRange(0, 7);
+	RGB8 sysColors[3] = { {0x1f<<2, 0x2d<<2, 0x31<<2, 0}, {0x24<<2, 0x37<<2, 0x3a<<2, 0},
+		{0x00<<2, 0x10<<2, 0x16<<2, 0}};
+	_vm->_palette->setPalette(&sysColors[0], 4, 3);
+
+	_backgroundSurface->loadBackground(sceneNumber, &_palData);
+	_vm->_palette->addRange(_palData);
+	_backgroundSurface->translate(_palData);
+
+	if (sceneNumber < 900) {
+		/*_backgroundSurface->fillRect(Common::Rect(0, MADS_SURFACE_HEIGHT,
+			_backgroundSurface->width(), _backgroundSurface->height()),
+			_vm->_palette->BLACK);*/
+		// TODO: interface palette
+		_interfaceSurface->madsloadInterface(0, &_interfacePal);
+		_vm->_palette->addRange(_interfacePal);
+		_interfaceSurface->translate(_interfacePal);
+		_backgroundSurface->copyFrom(_interfaceSurface, Common::Rect(0, 0, 320, 44), 0, 200 - 44);
+
+		_interfaceSurface->initialise();
+	}
+
+	// Don't load other screen resources for system screens
+	if (sceneNumber >= 900)
+		return;
+
+	loadSceneHotSpotsMads(sceneNumber);
+
+	// TODO: set walker scaling
+	// TODO: destroy woodscript buffer
+
+	// Load scene walk path file (*.COD/*.WW?)
+	loadSceneCodes(sceneNumber);
+
+	// Load inverse color table file (*.IPL)
+	loadSceneInverseColorTable(sceneNumber);
+
+	// Purge resources
+	_vm->res()->purge();
+}
+
+void MadsScene::show() {
+	Scene::show();
+	_vm->_viewManager->addView(_interfaceSurface);
+}
+
+void MadsScene::loadSceneCodes(int sceneNumber, int index) {
+	char filename[kM4MaxFilenameSize];
+	Common::SeekableReadStream *sceneS;
+
+	if (_vm->getGameType() == GType_Phantom || _vm->getGameType() == GType_DragonSphere) {
+		sprintf(filename, "rm%i.ww%i", sceneNumber, index);
+		MadsPack walkData(filename, _vm);
+		sceneS = walkData.getItemStream(0);
+		_codeSurface->loadCodesMads(sceneS);
+		_vm->res()->toss(filename);
+	} else if (_vm->getGameType() == GType_RexNebular) {
+		// TODO
+	}
+}
+
+void MadsScene::checkHotspotAtMousePos(int x, int y) {
+	HotSpot *currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
+	if (currentHotSpot != NULL) {
+		_vm->_mouse->setCursorNum(currentHotSpot->getCursor());
+
+		// This is the "easy" interface, which updates the status text when the mouse is moved
+		// TODO: toggle this code for easy/normal interface mode
+		char statusText[50];
+		int verbId = _currentAction;
+		if (verbId == kVerbNone)
+			verbId = currentHotSpot->getVerbID();
+		if (verbId == kVerbNone)
+			verbId = kVerbWalkTo;
+
+		sprintf(statusText, "%s %s\n", _madsVm->globals()->getVocab(verbId), currentHotSpot->getVocab());
+
+		statusText[0] = toupper(statusText[0]);	// capitalize first letter
+		setMADSStatusText(statusText);
+	} else {
+		_vm->_mouse->setCursorNum(0);
+		setMADSStatusText("");
+	}
+}
+
+void MadsScene::leftClick(int x, int y) {
+	HotSpot *currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
+	if (currentHotSpot != NULL) {
+		char statusText[50];
+		if (currentHotSpot->getVerbID() != 0) {
+			sprintf(statusText, "%s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab());
+		} else {
+			sprintf(statusText, "%s %s\n", _madsVm->globals()->getVocab(kVerbWalkTo), currentHotSpot->getVocab());
+		}
+
+		statusText[0] = toupper(statusText[0]);	// capitalize first letter
+		setMADSStatusText(statusText);
+	}
+}
+
+void MadsScene::rightClick(int x, int y) {
+	// ***DEBUG*** - sample dialog display
+	int idx = 3; //_madsVm->_globals->messageIndexOf(0x277a);
+	const char *msg = _madsVm->globals()->loadMessage(idx);
+	Dialog *dlg = new Dialog(_vm, msg, "TEST DIALOG");
+	_vm->_viewManager->addView(dlg);
+	_vm->_viewManager->moveToFront(dlg);
+}
+
+void MadsScene::setAction(int action, int objectId) {
 	VALIDATE_MADS;
 	char statusText[50];
 
@@ -699,12 +744,12 @@
 	// a second object can be selected, as in 'use gun to shoot person', with requires a target
 
 	// Set up the new action
-	strcpy(statusText, _madsVm->_globals->getVocab(action));
+	strcpy(statusText, _madsVm->globals()->getVocab(action));
 	statusText[0] = toupper(statusText[0]);	// capitalize first letter
 
 	if (objectId != -1) {
-		MadsObject *obj = _madsVm->_globals->getObject(objectId);
-		sprintf(statusText + strlen(statusText), " %s", _madsVm->_globals->getVocab(obj->descId));
+		MadsObject *obj = _madsVm->globals()->getObject(objectId);
+		sprintf(statusText + strlen(statusText), " %s", _madsVm->globals()->getVocab(obj->descId));
 	} else {
 		_currentAction = action;
 	}
@@ -712,14 +757,13 @@
 	setMADSStatusText(statusText);
 }
 
-
 /*--------------------------------------------------------------------------
  * MadsInterfaceView handles the user interface section at the bottom of
  * game screens in MADS games
  *--------------------------------------------------------------------------
  */
 
-MadsInterfaceView::MadsInterfaceView(MadsM4Engine *vm): View(vm, Common::Rect(0, MADS_SURFACE_HEIGHT,
+MadsInterfaceView::MadsInterfaceView(MadsM4Engine *vm): InterfaceView(vm, Common::Rect(0, MADS_SURFACE_HEIGHT,
 														 vm->_screen->width(), vm->_screen->height())) {
 	_screenType = VIEWID_INTERFACE;
 	_highlightedElement = -1;
@@ -772,8 +816,8 @@
 	// Build up the inventory list
 	_inventoryList.clear();
 
-	for (uint i = 0; i < _madsVm->_globals->getObjectsSize(); ++i) {
-		MadsObject *obj = _madsVm->_globals->getObject(i);
+	for (uint i = 0; i < _madsVm->globals()->getObjectsSize(); ++i) {
+		MadsObject *obj = _madsVm->globals()->getObject(i);
 		if (obj->roomNumber == PLAYER_INVENTORY)
 			_inventoryList.push_back(i);
 	}
@@ -823,7 +867,7 @@
 
 void MadsInterfaceView::addObjectToInventory(int objectNumber) {
 	if (_inventoryList.indexOf(objectNumber) == -1) {
-		_madsVm->_globals->getObject(objectNumber)->roomNumber = PLAYER_INVENTORY;
+		_madsVm->globals()->getObject(objectNumber)->roomNumber = PLAYER_INVENTORY;
 		_inventoryList.push_back(objectNumber);
 	}
 
@@ -847,7 +891,7 @@
 				((actionIndex == 0) ? ITEM_SELECTED : ITEM_NORMAL));
 
 			// Get the verb action and capitalise it
-			const char *verbStr = _madsVm->_globals->getVocab(kVerbLook + actionIndex);
+			const char *verbStr = _madsVm->globals()->getVocab(kVerbLook + actionIndex);
 			strcpy(buffer, verbStr);
 			if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
 
@@ -875,7 +919,7 @@
 		if ((_topIndex + i) >= _inventoryList.size())
 			break;
 
-		const char *descStr = _madsVm->_globals->getVocab(_madsVm->_globals->getObject(
+		const char *descStr = _madsVm->globals()->getVocab(_madsVm->globals()->getObject(
 			_inventoryList[_topIndex + i])->descId);
 		strcpy(buffer, descStr);
 		if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
@@ -898,21 +942,21 @@
 		M4Sprite *spr = _objectSprites->getFrame(_objectFrameNumber / INV_ANIM_FRAME_SPEED);
 		spr->copyTo(destSurface, INVENTORY_X, INVENTORY_Y, 0);
 
-		if (!_madsVm->_globals->invObjectsStill && !dialogVisible) {
+		if (!_madsVm->globals()->invObjectsStill && !dialogVisible) {
 			// If objetcs are to animated, move to the next frame
 			if (++_objectFrameNumber >= (_objectSprites->getCount() * INV_ANIM_FRAME_SPEED))
 				_objectFrameNumber = 0;
 		}
 
 		// List the vocab actions for the currently selected object
-		MadsObject *obj = _madsVm->_globals->getObject(_selectedObject);
+		MadsObject *obj = _madsVm->globals()->getObject(_selectedObject);
 		int yIndex = MIN(_highlightedElement - VOCAB_START, obj->vocabCount - 1);
 
 		for (int i = 0; i < obj->vocabCount; ++i) {
 			const Common::Rect r(_screenObjects[VOCAB_START + i]);
 
 			// Get the vocab description and capitalise it
-			const char *descStr = _madsVm->_globals->getVocab(obj->vocabList[i].vocabId);
+			const char *descStr = _madsVm->globals()->getVocab(obj->vocabList[i].vocabId);
 			strcpy(buffer, descStr);
 			if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
 
@@ -958,7 +1002,7 @@
 			_vm->_scene->setAction(kVerbLook + (_highlightedElement - ACTIONS_START));
 		} else if ((_highlightedElement >= VOCAB_START) && (_highlightedElement < (VOCAB_START + 5))) {
 			// A vocab action was selected
-			MadsObject *obj = _madsVm->_globals->getObject(_selectedObject);
+			MadsObject *obj = _madsVm->globals()->getObject(_selectedObject);
 			int vocabIndex = MIN(_highlightedElement - VOCAB_START, obj->vocabCount - 1);
 			if (vocabIndex >= 0)
 				_vm->_scene->setAction(obj->vocabList[vocabIndex].vocabId, _selectedObject);
@@ -1050,5 +1094,4 @@
 	return false;
 }
 
-
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-01-30 19:23:00 UTC (rev 47727)
+++ scummvm/trunk/engines/m4/scene.h	2010-01-30 23:03:07 UTC (rev 47728)
@@ -75,59 +75,98 @@
 	int32 railNodeCount;	// # of rails
 };
 
-class MadsInterfaceView;
+class M4Engine;
+class MadsEngine;
+class InterfaceView;
 
 class Scene: public View {
+private:
+	byte *_inverseColorTable;
+	HotSpotList _sceneHotspots;
+	char _statusText[100];
+protected:
+	int _currentScene;
+	InterfaceView *_interfaceSurface;
+	M4Surface *_backgroundSurface;
+	M4Surface *_codeSurface;
+	RGBList *_palData;
+	RGBList *_interfacePal;
+	SceneResources _sceneResources;
 public:
 	Scene(MadsM4Engine *vm);
-	~Scene();
+	virtual ~Scene();
 
+	// Methods that differ between engines
+	virtual void loadScene(int sceneNumber);
+	virtual void loadSceneCodes(int sceneNumber, int index = 0) = 0;
+	virtual void show();
+	virtual void checkHotspotAtMousePos(int x, int y) = 0;
+	virtual void leftClick(int x, int y) = 0;
+	virtual void rightClick(int x, int y) = 0;
+	virtual void setAction(int action, int objectId = -1) = 0;
+
 	// TODO: perhaps move playIntro() someplace else?
 	void playIntro();
-	void show();
-	void loadScene(int sceneNumber);
 	void loadSceneResources(int sceneNumber);
 	void loadSceneHotSpotsMads(int sceneNumber);
-	void loadSceneCodes(int sceneNumber, int index = 0);
 	void loadSceneInverseColorTable(int sceneNumber);
-	void loadSceneSprites(int sceneNumber);
 	void loadSceneSpriteCodes(int sceneNumber);
 	void showSprites();
-	void checkHotspotAtMousePos(int x, int y);
-	void checkHotspotAtMousePosMads(int x, int y);
 	void showHotSpots();
 	void showCodes();
 	int getCurrentScene() { return _currentScene; }
-	SceneResources getSceneResources() { return _sceneResources; }
 	M4Surface *getBackgroundSurface() const { return _backgroundSurface; }
 	byte *getInverseColorTable() const { return _inverseColorTable; }
-	MadsInterfaceView *getMadsInterface() { return _madsInterfaceSurface; }
-	void setAction(int action, int objectId = -1);
 	void update();
 	void setMADSStatusText(const char *text) { strcpy(_statusText, text); }
 	void showMADSV2TextBox(char *text, int x, int y, char *faceName);
+	InterfaceView *getInterface() { return _interfaceSurface; }
+	SceneResources getSceneResources() { return _sceneResources; }
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
 	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
+};
 
+class M4Scene: public Scene {
 private:
-	int _currentScene;
-	M4Surface *_backgroundSurface;
-	M4Surface *_codeSurface;
-	MadsInterfaceView *_madsInterfaceSurface;
-	byte *_inverseColorTable;
-	RGBList *_palData;
-	RGBList *_interfacePal;
-	SceneResources _sceneResources;
-	HotSpotList _sceneHotspots;
+	M4Engine *_vm;
 	SpriteAsset *_sceneSprites;
 	SpriteAsset *_walkerSprite;
-	int _currentAction;
-	char _statusText[100];
 
+	void loadSceneSprites(int sceneNumber);
 	void nextCommonCursor();
+public:
+	M4Scene(M4Engine *vm);
+	virtual ~M4Scene();
+
+	// Methods that differ between engines
+	virtual void loadScene(int sceneNumber);
+	virtual void loadSceneCodes(int sceneNumber, int index = 0);
+	virtual void checkHotspotAtMousePos(int x, int y);
+	virtual void leftClick(int x, int y);
+	virtual void rightClick(int x, int y);
+	virtual void setAction(int action, int objectId = -1);
 };
 
+class MadsScene: public Scene {
+private:
+	MadsEngine *_vm;
+
+	int _currentAction;
+public:
+	MadsScene(MadsEngine *vm);
+	virtual ~MadsScene() {};
+
+	// Methods that differ between engines
+	virtual void loadScene(int sceneNumber);
+	virtual void loadSceneCodes(int sceneNumber, int index = 0);
+	virtual void show();
+	virtual void checkHotspotAtMousePos(int x, int y);
+	virtual void leftClick(int x, int y);
+	virtual void rightClick(int x, int y);
+	virtual void setAction(int action, int objectId = -1);
+};
+
 enum InterfaceFontMode {ITEM_NORMAL, ITEM_HIGHLIGHTED, ITEM_SELECTED};
 
 enum InterfaceObjects {ACTIONS_START = 0, SCROLL_UP = 10, SCROLL_SCROLLER = 11, SCROLL_DOWN = 12,
@@ -143,7 +182,17 @@
 	}
 };
 
-class MadsInterfaceView: public View {
+class InterfaceView: public View {
+public:
+	InterfaceView(MadsM4Engine *vm, const Common::Rect &bounds): View(vm, bounds) {};
+	~InterfaceView() {};
+
+	virtual void initialise() {};
+	virtual void setSelectedObject(int objectNumber) {};
+	virtual void addObjectToInventory(int objectNumber) {};
+};
+
+class MadsInterfaceView: public InterfaceView {
 private:
 	IntegerList _inventoryList;
 	RectList _screenObjects;
@@ -165,9 +214,9 @@
 	MadsInterfaceView(MadsM4Engine *vm);
 	~MadsInterfaceView();
 
-	void initialise();
-	void setSelectedObject(int objectNumber);
-	void addObjectToInventory(int objectNumber);
+	virtual void initialise();
+	virtual void setSelectedObject(int objectNumber);
+	virtual void addObjectToInventory(int objectNumber);
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
 	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);


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

Revision: 47732
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47732&view=rev
Author:   dreammaster
Date:     2010-01-31 00:42:47 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Further work on separating the scene logic for MADS and M4

Modified Paths:
--------------
    scummvm/trunk/engines/m4/actor.cpp
    scummvm/trunk/engines/m4/converse.cpp
    scummvm/trunk/engines/m4/globals.cpp
    scummvm/trunk/engines/m4/gui.h
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/m4.h
    scummvm/trunk/engines/m4/m4_menus.cpp
    scummvm/trunk/engines/m4/m4_views.cpp
    scummvm/trunk/engines/m4/m4_views.h
    scummvm/trunk/engines/m4/module.mk
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h

Added Paths:
-----------
    scummvm/trunk/engines/m4/mads_views.cpp
    scummvm/trunk/engines/m4/mads_views.h

Modified: scummvm/trunk/engines/m4/actor.cpp
===================================================================
--- scummvm/trunk/engines/m4/actor.cpp	2010-01-31 00:14:23 UTC (rev 47731)
+++ scummvm/trunk/engines/m4/actor.cpp	2010-01-31 00:42:47 UTC (rev 47732)
@@ -149,11 +149,11 @@
 }
 
 void Inventory::addToBackpack(uint32 objectIndex) {
-	_vm->_interfaceView->inventoryAdd(_inventory[objectIndex]->name, "", _inventory[objectIndex]->icon);
+	_m4Vm->scene()->getInterface()->inventoryAdd(_inventory[objectIndex]->name, "", _inventory[objectIndex]->icon);
 }
 
 void Inventory::removeFromBackpack(uint32 objectIndex) {
-	_vm->_interfaceView->inventoryRemove(_inventory[objectIndex]->name);
+	_m4Vm->scene()->getInterface()->inventoryRemove(_inventory[objectIndex]->name);
 }
 
 bool Inventory::isInCurrentScene(char* name) {

Modified: scummvm/trunk/engines/m4/converse.cpp
===================================================================
--- scummvm/trunk/engines/m4/converse.cpp	2010-01-31 00:14:23 UTC (rev 47731)
+++ scummvm/trunk/engines/m4/converse.cpp	2010-01-31 00:42:47 UTC (rev 47732)
@@ -343,7 +343,7 @@
 
 	_playerCommandsAllowed = _vm->_player->commandsAllowed;
 	if (_vm->isM4())	// TODO: remove (interface not implemented yet in MADS games)
-		_interfaceWasVisible = _vm->_interfaceView->isVisible();
+		_interfaceWasVisible = _m4Vm->scene()->getInterface()->isVisible();
 	_vm->_player->setCommandsAllowed(false);
 	_style = style;
 
@@ -352,7 +352,7 @@
 		_vm->_mouse->lockCursor(CURSOR_ARROW);
 
 		if (_interfaceWasVisible)
-			_vm->_interfaceView->hide();
+			_m4Vm->scene()->getInterface()->hide();
 
 		_vm->_conversationView->setNode(0);
 		_vm->_conversationView->show();
@@ -368,7 +368,7 @@
 	_offsetMap.clear();
 	_vm->_player->setCommandsAllowed(_playerCommandsAllowed);
 	if (_interfaceWasVisible)
-		_vm->_interfaceView->show();
+		_m4Vm->scene()->getInterface()->show();
 }
 
 void Converse::loadConversation(const char *convName) {

Modified: scummvm/trunk/engines/m4/globals.cpp
===================================================================
--- scummvm/trunk/engines/m4/globals.cpp	2010-01-31 00:14:23 UTC (rev 47731)
+++ scummvm/trunk/engines/m4/globals.cpp	2010-01-31 00:42:47 UTC (rev 47732)
@@ -271,7 +271,7 @@
 }
 
 bool Globals::isInterfaceVisible() {
-	return _vm->_interfaceView->isVisible();
+	return _m4Vm->scene()->getInterface()->isVisible();
 }
 
 /*--------------------------------------------------------------------------*/
@@ -434,7 +434,7 @@
 	if (value) {
 		// Player commands are enabled again
 		_vm->_mouse->lockCursor(CURSOR_ARROW);
-		//_vm->_interfaceView->cancelSentence();
+		//_m4Vm->scene()->getInterface()->cancelSentence();
 	} else {
 		// Player commands are disabled, so show hourglass cursor
 		_vm->_mouse->lockCursor(CURSOR_HOURGLASS);

Modified: scummvm/trunk/engines/m4/gui.h
===================================================================
--- scummvm/trunk/engines/m4/gui.h	2010-01-31 00:14:23 UTC (rev 47731)
+++ scummvm/trunk/engines/m4/gui.h	2010-01-31 00:42:47 UTC (rev 47732)
@@ -441,6 +441,16 @@
 	void keyMouseCollision() {}
 };
 
+class GameInterfaceView: public View {
+public:
+	GameInterfaceView(MadsM4Engine *vm, const Common::Rect &rect): View(vm, rect) {};
+	~GameInterfaceView() {};
+
+	virtual void initialise() {};
+	virtual void setSelectedObject(int objectNumber) {};
+	virtual void addObjectToInventory(int objectNumber) {};
+};
+
 }
 
 #endif

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2010-01-31 00:14:23 UTC (rev 47731)
+++ scummvm/trunk/engines/m4/m4.cpp	2010-01-31 00:42:47 UTC (rev 47732)
@@ -169,7 +169,6 @@
 	_font = new Font(this);
 	if (getGameType() == GType_Burger) {
 		_actor = new Actor(this);
-		_interfaceView = new GameInterfaceView(this);
 		_conversationView = new ConversationView(this);
 	} else {
 		_actor = NULL;
@@ -352,8 +351,6 @@
 									   burger_inventory[i].icon);
 			_inventory->addToBackpack(i);	// debug: this adds ALL objects to the player's backpack
 		}
-
-		_viewManager->addView(_interfaceView);
 	}
 
 	// Show intro
@@ -420,6 +417,8 @@
 
 			_kernel->roomInit();
 
+			_scene->show();
+
 #ifdef INTRO_TEST
 			if (_kernel->currentRoom == 951) {
 				curPart = 0;
@@ -516,17 +515,17 @@
 	_mouse->setCursorNum(0);
 
 	// Load MADS data files
-	MadsGlobals *globals = (MadsGlobals *)_globals;
-	globals->loadMadsVocab();			// vocab.dat
-	globals->loadMadsQuotes();			// quotes.dat
-	globals->loadMadsMessagesInfo();	// messages.dat
-	globals->loadMadsObjects();
+	MadsGlobals *globs = (MadsGlobals *)_globals;
+	globs->loadMadsVocab();			// vocab.dat
+	globs->loadMadsQuotes();			// quotes.dat
+	globs->loadMadsMessagesInfo();	// messages.dat
+	globs->loadMadsObjects();
 
 	// Setup globals
-	globals->easyMouse = true;
-	globals->invObjectsStill = false;
-	globals->textWindowStill = false;
-	globals->storyMode = 0;
+	globs->easyMouse = true;
+	globs->invObjectsStill = false;
+	globs->textWindowStill = false;
+	globs->storyMode = 0;
 
 	// Test code to dump all messages to the console
 	//for (int i = 0; i < _globals->getMessagesSize(); i++)

Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h	2010-01-31 00:14:23 UTC (rev 47731)
+++ scummvm/trunk/engines/m4/m4.h	2010-01-31 00:42:47 UTC (rev 47732)
@@ -80,7 +80,7 @@
 class ViewManager;
 class View;
 class Inventory;
-class GameInterfaceView;
+class M4InterfaceView;
 class ConversationView;
 class Actor;
 class Converse;
@@ -190,7 +190,6 @@
 	Dialogs *_dialogs;
 	M4Surface *_screen;
 	Inventory *_inventory;
-	GameInterfaceView *_interfaceView;
 	ConversationView *_conversationView;
 	Sound *_sound;
 	Rails *_rails;
@@ -199,6 +198,8 @@
 	WoodScript *_ws;
 	Animation *_animation;
 	Common::RandomSource *_random;
+
+	Scene *scene() { return _scene; };
 };
 
 class MadsEngine: public MadsM4Engine {

Modified: scummvm/trunk/engines/m4/m4_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_menus.cpp	2010-01-31 00:14:23 UTC (rev 47731)
+++ scummvm/trunk/engines/m4/m4_menus.cpp	2010-01-31 00:42:47 UTC (rev 47732)
@@ -328,9 +328,9 @@
 	_calledFromMainMenu = calledFromMainMenu;
 	_loadSaveFromHotkey = loadSaveFromHotkey;
 
-	_interfaceWasVisible = _vm->_interfaceView->isVisible();
+	_interfaceWasVisible = _m4Vm->scene()->getInterface()->isVisible();
 	if (_interfaceWasVisible)
-		_vm->_interfaceView->hide();
+		_m4Vm->scene()->getInterface()->hide();
 
 	_vm->_mouse->setCursorNum(CURSOR_ARROW);
 
@@ -496,11 +496,11 @@
 	// Translate the game interface view - since it's using standard colors that can't be
 	// averaged, simply take the top left pixel of every 3x3 pixel block
 
-	_vm->_interfaceView->onRefresh(NULL, &srcSurface);
-	destP = result->getBasePtr(0, 0) + (_vm->_screen->width() / 3) * (_vm->_interfaceView->bounds().top / 3);
+	_m4Vm->scene()->getInterface()->onRefresh(NULL, &srcSurface);
+	destP = result->getBasePtr(0, 0) + (_vm->_screen->width() / 3) * (_m4Vm->scene()->getInterface()->bounds().top / 3);
 
-	int yStart = _vm->_interfaceView->bounds().top;
-	int yEnd = MIN(_vm->_screen->height() - 1, (int) _vm->_interfaceView->bounds().bottom - 1);
+	int yStart = _m4Vm->scene()->getInterface()->bounds().top;
+	int yEnd = MIN(_vm->_screen->height() - 1, (int) _m4Vm->scene()->getInterface()->bounds().bottom - 1);
 	for (int yCtr = yStart; yCtr <= yEnd; yCtr += 3) {
 		srcP = (byte *)srcSurface.getBasePtr(0, yCtr) + (yCtr * _vm->_screen->width());
 
@@ -526,7 +526,7 @@
 		engine->_palette->fadeFromGreen(M4_DIALOG_FADE_STEPS, M4_DIALOG_FADE_DELAY, fadeToBlack);
 
 		if (interfaceVisible)
-			engine->_interfaceView->show();
+			engine->scene()->showInterface();
 	}
 }
 

Modified: scummvm/trunk/engines/m4/m4_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_views.cpp	2010-01-31 00:14:23 UTC (rev 47731)
+++ scummvm/trunk/engines/m4/m4_views.cpp	2010-01-31 00:42:47 UTC (rev 47732)
@@ -127,7 +127,7 @@
 			if (result) {
 				for (int i = 0; i < overIndex + _scrollPosition; i++)
 					++curItem;
-				_vm->_interfaceView->setStatusText(curItem->get()->name);
+				_m4Vm->scene()->getInterface()->setStatusText(curItem->get()->name);
 			}
 		}
 
@@ -218,8 +218,8 @@
 
 #define SPR(x) _sprites->getFrame(x)
 
-GameInterfaceView::GameInterfaceView(MadsM4Engine *vm):
-		View(vm, Common::Rect(0, vm->_screen->height() - INTERFACE_HEIGHT,
+M4InterfaceView::M4InterfaceView(MadsM4Engine *vm): 
+		GameInterfaceView(vm, Common::Rect(0, vm->_screen->height() - INTERFACE_HEIGHT,
 				vm->_screen->width(), vm->_screen->height())),
 		_statusText(GUITextField(this, Common::Rect(200, 1, 450, 21))),
 		_inventory(GUIInventory(this, vm, Common::Rect(188, 22, 539, 97), 9, 1, 39, 75, 3)) {
@@ -256,11 +256,11 @@
 
 #undef SPR
 
-GameInterfaceView::~GameInterfaceView() {
+M4InterfaceView::~M4InterfaceView() {
 	delete _sprites;
 }
 
-void GameInterfaceView::setHighlightedButton(int index) {
+void M4InterfaceView::setHighlightedButton(int index) {
 	if (index == _highlightedIndex)
 		return;
 
@@ -268,7 +268,7 @@
 	_highlightedIndex = index;
 }
 
-bool GameInterfaceView::onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents) {
+bool M4InterfaceView::onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents) {
 	static bool selectionFlag = false;
 	if (eventType == MEVENT_LEFT_RELEASE)
 		selectionFlag = false;
@@ -287,7 +287,7 @@
 	if (_vm->_mouse->getCursorNum() != CURSOR_LOOK &&
 		_vm->_mouse->getCursorNum() != CURSOR_TAKE &&
 		_vm->_mouse->getCursorNum() != CURSOR_USE &&
-		_vm->_interfaceView->_inventory.getSelectedIndex() == -1) {
+		_m4Vm->scene()->getInterface()->_inventory.getSelectedIndex() == -1) {
 		if (_vm->_mouse->getCursorNum() != 0)
 			_vm->_mouse->setCursorNum(0);
 	}
@@ -330,7 +330,7 @@
 	return true;
 }
 
-void GameInterfaceView::onRefresh(RectList *rects, M4Surface *destSurface) {
+void M4InterfaceView::onRefresh(RectList *rects, M4Surface *destSurface) {
 	clear();
 
 	_statusText.onRefresh();

Modified: scummvm/trunk/engines/m4/m4_views.h
===================================================================
--- scummvm/trunk/engines/m4/m4_views.h	2010-01-31 00:14:23 UTC (rev 47731)
+++ scummvm/trunk/engines/m4/m4_views.h	2010-01-31 00:42:47 UTC (rev 47732)
@@ -87,7 +87,7 @@
 	void setVisible(bool value) { _visible = value; }
 };
 
-class GameInterfaceView: public View {
+class M4InterfaceView: public GameInterfaceView {
 	typedef Common::List<Common::SharedPtr<GUIButton> > ButtonList;
 	typedef ButtonList::iterator ButtonsIterator;
 public:
@@ -100,8 +100,8 @@
 private:
 	void setHighlightedButton(int index);
 public:
-	GameInterfaceView(MadsM4Engine *vm);
-	~GameInterfaceView();
+	M4InterfaceView(MadsM4Engine *vm);
+	~M4InterfaceView();
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
 	bool onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents);

Added: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	                        (rev 0)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-01-31 00:42:47 UTC (rev 47732)
@@ -0,0 +1,378 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "m4/m4_views.h"
+#include "m4/dialogs.h"
+#include "m4/events.h"
+#include "m4/font.h"
+#include "m4/globals.h"
+#include "m4/m4.h"
+#include "m4/staticres.h"
+
+namespace M4 {
+
+static const int INV_ANIM_FRAME_SPEED = 8;
+static const int INVENTORY_X = 160;
+static const int INVENTORY_Y = 159;
+static const int SCROLLER_DELAY = 200;
+
+/*--------------------------------------------------------------------------
+ * MadsInterfaceView handles the user interface section at the bottom of
+ * game screens in MADS games
+ *--------------------------------------------------------------------------
+ */
+
+MadsInterfaceView::MadsInterfaceView(MadsM4Engine *vm): GameInterfaceView(vm, 
+		Common::Rect(0, MADS_SURFACE_HEIGHT, vm->_screen->width(), vm->_screen->height())) {
+	_screenType = VIEWID_INTERFACE;
+	_highlightedElement = -1;
+	_topIndex = 0;
+	_selectedObject = -1;
+	_cheatKeyCtr = 0;
+
+	_objectSprites = NULL;
+	_objectPalData = NULL;
+
+	/* Set up the rect list for screen elements */
+	// Actions
+	for (int i = 0; i < 10; ++i)
+		_screenObjects.addRect((i / 5) * 32 + 1, (i % 5) * 8 + MADS_SURFACE_HEIGHT + 2,
+			((i / 5) + 1) * 32 + 3, ((i % 5) + 1) * 8 + MADS_SURFACE_HEIGHT + 2);
+
+	// Scroller elements (up arrow, scroller, down arrow)
+	_screenObjects.addRect(73, 160, 82, 167);
+	_screenObjects.addRect(73, 168, 82, 190);
+	_screenObjects.addRect(73, 191, 82, 198);
+
+	// Inventory object names
+	for (int i = 0; i < 5; ++i)
+		_screenObjects.addRect(89, 158 + i * 8, 160, 166 + i * 8);
+
+	// Full rectangle area for all vocab actions
+	for (int i = 0; i < 5; ++i)
+		_screenObjects.addRect(239, 158 + i * 8, 320, 166 + i * 8);
+}
+
+MadsInterfaceView::~MadsInterfaceView() {
+	delete _objectSprites;
+}
+
+void MadsInterfaceView::setFontMode(InterfaceFontMode newMode) {
+	switch (newMode) {
+	case ITEM_NORMAL:
+		_vm->_font->setColors(4, 4, 0xff);
+		break;
+	case ITEM_HIGHLIGHTED:
+		_vm->_font->setColors(5, 5, 0xff);
+		break;
+	case ITEM_SELECTED:
+		_vm->_font->setColors(6, 6, 0xff);
+		break;
+	}
+}
+
+void MadsInterfaceView::initialise() {
+	// Build up the inventory list
+	_inventoryList.clear();
+
+	for (uint i = 0; i < _madsVm->globals()->getObjectsSize(); ++i) {
+		MadsObject *obj = _madsVm->globals()->getObject(i);
+		if (obj->roomNumber == PLAYER_INVENTORY)
+			_inventoryList.push_back(i);
+	}
+
+	// If the inventory has at least one object, select it
+	if (_inventoryList.size() > 0)
+		setSelectedObject(_inventoryList[0]);
+}
+
+void MadsInterfaceView::setSelectedObject(int objectNumber) {
+	char resName[80];
+
+	// Load inventory resource
+	if (_objectSprites) {
+		_vm->_palette->deleteRange(_objectPalData);
+		delete _objectSprites;
+	}
+
+	// Check to make sure the object is in the inventory, and also visible on-screen
+	int idx = _inventoryList.indexOf(objectNumber);
+	if (idx == -1) {
+		// Object wasn't found, so return
+		_selectedObject = -1;
+		return;
+	}
+
+	// Found the object
+	if (idx < _topIndex)
+		_topIndex = idx;
+	else if (idx >= (_topIndex + 5))
+		_topIndex = MAX(0, idx - 4);
+
+	_selectedObject = objectNumber;
+	sprintf(resName, "*OB%.3dI.SS", objectNumber);
+
+	Common::SeekableReadStream *data = _vm->res()->get(resName);
+	_objectSprites = new SpriteAsset(_vm, data, data->size(), resName);
+	_vm->res()->toss(resName);
+
+	// Slot it into available palette space
+	_objectPalData = _objectSprites->getRgbList();
+	_vm->_palette->addRange(_objectPalData);
+	_objectSprites->translate(_objectPalData, true);
+
+	_objectFrameNumber = 0;
+}
+
+void MadsInterfaceView::addObjectToInventory(int objectNumber) {
+	if (_inventoryList.indexOf(objectNumber) == -1) {
+		_madsVm->globals()->getObject(objectNumber)->roomNumber = PLAYER_INVENTORY;
+		_inventoryList.push_back(objectNumber);
+	}
+
+	setSelectedObject(objectNumber);
+}
+
+void MadsInterfaceView::onRefresh(RectList *rects, M4Surface *destSurface) {
+	_vm->_font->setFont(FONT_INTERFACE_MADS);
+	char buffer[100];
+
+	// Check to see if any dialog is currently active
+	bool dialogVisible = _vm->_viewManager->getView(LAYER_DIALOG) != NULL;
+
+	// Highlighting logic for action list
+	int actionIndex = 0;
+	for (int x = 0; x < 2; ++x) {
+		for (int y = 0; y < 5; ++y, ++actionIndex) {
+			// Determine the font colour depending on whether an item is selected. Note that the first action,
+			// 'Look', is always 'selected', even when another action is clicked on
+			setFontMode((_highlightedElement == actionIndex) ? ITEM_HIGHLIGHTED :
+				((actionIndex == 0) ? ITEM_SELECTED : ITEM_NORMAL));
+
+			// Get the verb action and capitalise it
+			const char *verbStr = _madsVm->globals()->getVocab(kVerbLook + actionIndex);
+			strcpy(buffer, verbStr);
+			if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
+
+			// Display the verb
+			const Common::Rect r(_screenObjects[actionIndex]);
+			_vm->_font->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
+		}
+	}
+
+	// Check for highlighting of the scrollbar controls
+	if ((_highlightedElement == SCROLL_UP) || (_highlightedElement == SCROLL_SCROLLER) || (_highlightedElement == SCROLL_DOWN)) {
+		// Highlight the control's borders
+		const Common::Rect r(_screenObjects[_highlightedElement]);
+		destSurface->frameRect(r, 5);
+	}
+
+	// Draw the horizontal line in the scroller representing the current top selected
+	const Common::Rect scroller(_screenObjects[SCROLL_SCROLLER]);
+	int yP = (_inventoryList.size() < 2) ? 0 : (scroller.height() - 5) * _topIndex / (_inventoryList.size() - 1);
+	destSurface->setColor(4);
+	destSurface->hLine(scroller.left + 2, scroller.right - 3, scroller.top + 2 + yP);
+
+	// List inventory items
+	for (uint i = 0; i < 5; ++i) {
+		if ((_topIndex + i) >= _inventoryList.size())
+			break;
+
+		const char *descStr = _madsVm->globals()->getVocab(_madsVm->globals()->getObject(
+			_inventoryList[_topIndex + i])->descId);
+		strcpy(buffer, descStr);
+		if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
+
+		const Common::Rect r(_screenObjects[INVLIST_START + i]);
+
+		// Set the highlighting of the inventory item
+		if (_highlightedElement == (int)(INVLIST_START + i)) setFontMode(ITEM_HIGHLIGHTED);
+		else if (_selectedObject == _inventoryList[_topIndex + i]) setFontMode(ITEM_SELECTED);
+		else setFontMode(ITEM_NORMAL);
+
+		// Write out it's description
+		_vm->_font->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
+	}
+
+	// Handle the display of any currently selected object
+	if (_objectSprites) {
+		// Display object sprite. Note that the frame number isn't used directly, because it would result
+		// in too fast an animation
+		M4Sprite *spr = _objectSprites->getFrame(_objectFrameNumber / INV_ANIM_FRAME_SPEED);
+		spr->copyTo(destSurface, INVENTORY_X, INVENTORY_Y, 0);
+
+		if (!_madsVm->globals()->invObjectsStill && !dialogVisible) {
+			// If objetcs are to animated, move to the next frame
+			if (++_objectFrameNumber >= (_objectSprites->getCount() * INV_ANIM_FRAME_SPEED))
+				_objectFrameNumber = 0;
+		}
+
+		// List the vocab actions for the currently selected object
+		MadsObject *obj = _madsVm->globals()->getObject(_selectedObject);
+		int yIndex = MIN(_highlightedElement - VOCAB_START, obj->vocabCount - 1);
+
+		for (int i = 0; i < obj->vocabCount; ++i) {
+			const Common::Rect r(_screenObjects[VOCAB_START + i]);
+
+			// Get the vocab description and capitalise it
+			const char *descStr = _madsVm->globals()->getVocab(obj->vocabList[i].vocabId);
+			strcpy(buffer, descStr);
+			if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
+
+			// Set the highlighting and display the entry
+			setFontMode((i == yIndex) ? ITEM_HIGHLIGHTED : ITEM_NORMAL);
+			_vm->_font->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
+		}
+	}
+}
+
+bool MadsInterfaceView::onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents) {
+	// If the mouse isn't being held down, then reset the repeated scroll timer
+	if (eventType != MEVENT_LEFT_HOLD)
+		_nextScrollerTicks = 0;
+
+	// Handle various event types
+	switch (eventType) {
+	case MEVENT_MOVE:
+		// If the cursor isn't in "wait mode", don't do any processing
+		if (_vm->_mouse->getCursorNum() == CURSOR_WAIT)
+			return true;
+
+		// Ensure the cursor is the standard arrow
+		_vm->_mouse->setCursorNum(CURSOR_ARROW);
+
+		// Check if any interface element is currently highlighted
+		_highlightedElement = _screenObjects.find(Common::Point(x, y));
+
+		return true;
+
+	case MEVENT_LEFT_CLICK:
+		// Left mouse click
+		// Check if an inventory object was selected
+		if ((_highlightedElement >= INVLIST_START) && (_highlightedElement < (INVLIST_START + 5))) {
+			// Ensure there is an inventory item listed in that cell
+			uint idx = _highlightedElement - INVLIST_START;
+			if ((_topIndex + idx) < _inventoryList.size()) {
+				// Set the selected object
+				setSelectedObject(_inventoryList[_topIndex + idx]);
+			}
+		} else if ((_highlightedElement >= ACTIONS_START) && (_highlightedElement < (ACTIONS_START + 10))) {
+			// A standard action was selected
+			_vm->_scene->setAction(kVerbLook + (_highlightedElement - ACTIONS_START));
+		} else if ((_highlightedElement >= VOCAB_START) && (_highlightedElement < (VOCAB_START + 5))) {
+			// A vocab action was selected
+			MadsObject *obj = _madsVm->globals()->getObject(_selectedObject);
+			int vocabIndex = MIN(_highlightedElement - VOCAB_START, obj->vocabCount - 1);
+			if (vocabIndex >= 0)
+				_vm->_scene->setAction(obj->vocabList[vocabIndex].vocabId, _selectedObject);
+		}
+
+		return true;
+
+	case MEVENT_LEFT_HOLD:
+		// Left mouse hold
+		// Handle the scroller - the up/down buttons allow for multiple actions whilst the mouse is held down
+		if ((_highlightedElement == SCROLL_UP) || (_highlightedElement == SCROLL_DOWN)) {
+			if ((_nextScrollerTicks == 0) || (g_system->getMillis() >= _nextScrollerTicks)) {
+				// Handle scroll up/down action
+				_nextScrollerTicks = g_system->getMillis() + SCROLLER_DELAY;
+
+				if ((_highlightedElement == SCROLL_UP) && (_topIndex > 0))
+					--_topIndex;
+				if ((_highlightedElement == SCROLL_DOWN) && (_topIndex < (int)(_inventoryList.size() - 1)))
+					++_topIndex;
+			}
+		}
+		return true;
+
+	case MEVENT_LEFT_DRAG:
+		// Left mouse drag
+		// Handle the the the scroller area that can be dragged to adjust the top displayed index
+		if (_highlightedElement == SCROLL_SCROLLER) {
+			// Calculate the new top index based on the Y position
+			const Common::Rect r(_screenObjects[SCROLL_SCROLLER]);
+			_topIndex = CLIP((int)(_inventoryList.size() - 1) * (y - r.top - 2) / (r.height() - 5),
+				0, (int)_inventoryList.size() - 1);
+		}
+		return true;
+
+	case KEVENT_KEY:
+		if (_cheatKeyCtr == CHEAT_SEQUENCE_MAX)
+			handleCheatKey(param1);
+		handleKeypress(param1);
+		return true;
+
+	default:
+		break;
+	}
+
+	return false;
+}
+
+bool MadsInterfaceView::handleCheatKey(int32 keycode) {
+	switch (keycode) {
+	case Common::KEYCODE_SPACE:
+		// TODO: Move player to current destination
+		return true;
+
+	case Common::KEYCODE_t | (Common::KEYCODE_LALT):
+	case Common::KEYCODE_t | (Common::KEYCODE_RALT):
+	{
+		// Teleport to room
+		//Scene *sceneView = (Scene *)vm->_viewManager->getView(VIEWID_SCENE);
+
+
+		return true;
+	}
+
+	default:
+		break;
+	}
+
+	return false;
+}
+
+const char *CHEAT_SEQUENCE = "widepipe";
+
+bool MadsInterfaceView::handleKeypress(int32 keycode) {
+	int flags = keycode >> 24;
+	int kc = keycode & 0xffff;
+
+	// Capitalise the letter if necessary
+	if (_cheatKeyCtr < CHEAT_SEQUENCE_MAX) {
+		if ((flags == Common::KBD_CTRL) && (kc == CHEAT_SEQUENCE[_cheatKeyCtr])) {
+			++_cheatKeyCtr;
+			if (_cheatKeyCtr == CHEAT_SEQUENCE_MAX)
+				Dialog::display(_vm, 22, cheatingEnabledDesc);
+			return true;
+		} else {
+			_cheatKeyCtr = 0;
+		}
+	}
+
+	return false;
+}
+
+} // End of namespace M4


Property changes on: scummvm/trunk/engines/m4/mads_views.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	                        (rev 0)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-01-31 00:42:47 UTC (rev 47732)
@@ -0,0 +1,84 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef M4_MADS_VIEWS_H
+#define M4_MADS_VIEWS_H
+
+#include "m4/gui.h"
+#include "m4/viewmgr.h"
+#include "common/rect.h"
+#include "common/list.h"
+#include "common/ptr.h"
+
+namespace M4 {
+
+class IntegerList: public Common::Array<int> {
+public:
+	int indexOf(int v) {
+		for (uint i = 0; i < size(); ++i)
+			if (operator [](i) == v)
+				return i;
+		return -1;
+	}
+};
+
+enum InterfaceFontMode {ITEM_NORMAL, ITEM_HIGHLIGHTED, ITEM_SELECTED};
+
+enum InterfaceObjects {ACTIONS_START = 0, SCROLL_UP = 10, SCROLL_SCROLLER = 11, SCROLL_DOWN = 12,
+		INVLIST_START = 13, VOCAB_START = 18};
+
+class MadsInterfaceView: public GameInterfaceView {
+private:
+	IntegerList _inventoryList;
+	RectList _screenObjects;
+	int _highlightedElement;
+	int _topIndex;
+	uint32 _nextScrollerTicks;
+	int _cheatKeyCtr;
+
+	// Object display fields
+	int _selectedObject;
+	SpriteAsset *_objectSprites;
+	RGBList *_objectPalData;
+	int _objectFrameNumber;
+
+	void setFontMode(InterfaceFontMode newMode);
+	bool handleCheatKey(int32 keycode);
+	bool handleKeypress(int32 keycode);
+public:
+	MadsInterfaceView(MadsM4Engine *vm);
+	~MadsInterfaceView();
+
+	virtual void initialise();
+	virtual void setSelectedObject(int objectNumber);
+	virtual void addObjectToInventory(int objectNumber);
+
+	void onRefresh(RectList *rects, M4Surface *destSurface);
+	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
+};
+
+}
+
+#endif


Property changes on: scummvm/trunk/engines/m4/mads_views.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Modified: scummvm/trunk/engines/m4/module.mk
===================================================================
--- scummvm/trunk/engines/m4/module.mk	2010-01-31 00:14:23 UTC (rev 47731)
+++ scummvm/trunk/engines/m4/module.mk	2010-01-31 00:42:47 UTC (rev 47732)
@@ -20,6 +20,7 @@
 	m4_views.o \
 	mads_anim.o \
 	mads_menus.o \
+	mads_views.o \
 	midi.o \
 	rails.o \
 	resource.o \

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-01-31 00:14:23 UTC (rev 47731)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-01-31 00:42:47 UTC (rev 47732)
@@ -33,17 +33,12 @@
 #include "m4/rails.h"
 #include "m4/font.h"
 #include "m4/m4_views.h"
+#include "m4/mads_views.h"
 #include "m4/compression.h"
 #include "m4/staticres.h"
 
 namespace M4 {
 
-static const int INV_ANIM_FRAME_SPEED = 8;
-static const int INVENTORY_X = 160;
-static const int INVENTORY_Y = 159;
-static const int SCROLLER_DELAY = 200;
-
-
 Scene::Scene(MadsM4Engine *vm): View(vm, Common::Rect(0, 0, vm->_screen->width(), vm->_screen->height())) {
 	_screenType = VIEWID_SCENE;
 
@@ -56,7 +51,6 @@
 	_interfacePal = NULL;
 	_interfaceSurface = NULL;
 	_inverseColorTable = NULL;
-	strcpy(_statusText, "");
 	_vm->_rails->setCodeSurface(_codeSurface);
 }
 
@@ -98,6 +92,14 @@
 	_vm->_viewManager->addView(this);
 }
 
+void Scene::showInterface() {
+	_vm->_viewManager->addView(_interfaceSurface);
+}
+
+void Scene::hideInterface() {
+	_vm->_viewManager->deleteView(_interfaceSurface);
+}
+
 void Scene::loadSceneResources(int sceneNumber) {
 	char filename[kM4MaxFilenameSize];
 	int i = 0, x = 0, y = 0;
@@ -280,28 +282,6 @@
 
 }
 
-void Scene::update() {
-	// TODO: Needs a proper implementation
-	// NOTE: Don't copy the background when in M4 mode or WoodScript anims won't be shown
-	if (!_vm->isM4()) {
-		_backgroundSurface->copyTo(this);
-
-		// Handle display of any status text
-		if (_statusText[0]) {
-			// Text colors are inverted in Dragonsphere
-			if (_vm->getGameType() == GType_DragonSphere)
-				_vm->_font->setColors(_vm->_palette->BLACK, _vm->_palette->WHITE, _vm->_palette->BLACK);
-			else
-				_vm->_font->setColors(_vm->_palette->WHITE, _vm->_palette->BLACK, _vm->_palette->BLACK);
-
-			_vm->_font->setFont(FONT_MAIN_MADS);
-			_vm->_font->writeString(this, _statusText, (width() - _vm->_font->getWidth(_statusText)) / 2, 142, 0);
-		}
-
-		_interfaceSurface->copyTo(this, 0, this->height() - _interfaceSurface->height());
-	}
-}
-
 void Scene::onRefresh(RectList *rects, M4Surface *destSurface) {
 	update();
 	View::onRefresh(rects, destSurface);
@@ -435,6 +415,7 @@
 M4Scene::M4Scene(M4Engine *vm): Scene(vm) {
 	_vm = vm;
 	_sceneSprites = NULL;
+	_interfaceSurface = new M4InterfaceView(vm);
 }
 
 M4Scene::~M4Scene() {
@@ -460,7 +441,7 @@
 
 	if (_vm->getGameType() == GType_Burger &&
 			sceneNumber != TITLE_SCENE_BURGER && sceneNumber != MAINMENU_SCENE_BURGER)
-		_vm->_interfaceView->setStatusText("");
+		setStatusText("");
 
 	// Load scene def file (*.CHK)
 	loadSceneResources(sceneNumber);
@@ -485,7 +466,7 @@
 
 
 	if (sceneNumber != TITLE_SCENE_BURGER && sceneNumber != MAINMENU_SCENE_BURGER) {
-		_vm->_interfaceView->show();
+		_m4Vm->scene()->getInterface()->show();
 		showSprites();
 	}
 
@@ -503,6 +484,11 @@
 	_vm->res()->toss(filename);
 }
 
+void M4Scene::show() {
+	Scene::show();
+	_vm->_viewManager->addView(_interfaceSurface);
+}
+
 void M4Scene::checkHotspotAtMousePos(int x, int y) {
 	if (_vm->getGameType() == GType_Riddle)
 		return;
@@ -517,15 +503,15 @@
 		if (_vm->_mouse->getCursorNum() != CURSOR_LOOK &&
 			_vm->_mouse->getCursorNum() != CURSOR_TAKE &&
 			_vm->_mouse->getCursorNum() != CURSOR_USE &&
-			_vm->_interfaceView->_inventory.getSelectedIndex() == -1) {
+			_m4Vm->scene()->getInterface()->_inventory.getSelectedIndex() == -1) {
 			_vm->_mouse->setCursorNum(currentHotSpot->getCursor());
 		}
-		_vm->_interfaceView->setStatusText(currentHotSpot->getPrep());
+		_m4Vm->scene()->getInterface()->setStatusText(currentHotSpot->getPrep());
 	} else {
 		if (_vm->_mouse->getCursorNum() != CURSOR_LOOK &&
 			_vm->_mouse->getCursorNum() != CURSOR_TAKE &&
 			_vm->_mouse->getCursorNum() != CURSOR_USE &&
-			_vm->_interfaceView->_inventory.getSelectedIndex() == -1) {
+			_m4Vm->scene()->getInterface()->_inventory.getSelectedIndex() == -1) {
 			_vm->_mouse->setCursorNum(0);
 		} else {
 
@@ -551,14 +537,14 @@
 			printf("Player said: %s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab());
 
 			// FIXME: This should be moved somewhere else, and is incomplete
-			if (_vm->_interfaceView->_inventory.getSelectedIndex() == -1) {
+			if (_m4Vm->scene()->getInterface()->_inventory.getSelectedIndex() == -1) {
 				if (_vm->_mouse->getVerb() == NULL) {
 					strcpy(_vm->_player->verb, currentHotSpot->getVerb());
 				} else {
 					strcpy(_vm->_player->verb, _vm->_mouse->getVerb());
 				}
 			} else {
-				strcpy(_vm->_player->verb, _vm->_interfaceView->_inventory.getSelectedObjectName());
+				strcpy(_vm->_player->verb, _m4Vm->scene()->getInterface()->_inventory.getSelectedObjectName());
 			}
 			strcpy(_vm->_player->noun, currentHotSpot->getVocab());
 			strcpy(_vm->_player->object, "");
@@ -573,13 +559,21 @@
 void M4Scene::rightClick(int x, int y) {
 	if (_vm->getGameType() == GType_Burger) {
 		nextCommonCursor();
-		_vm->_interfaceView->_inventory.clearSelected();
+		_m4Vm->scene()->getInterface()->_inventory.clearSelected();
 	}
 }
 
 void M4Scene::setAction(int action, int objectId) {
 }
 
+void M4Scene::setStatusText(const char *text) {
+	getInterface()->setStatusText(text);
+}
+
+void M4Scene::update() {
+
+}
+
 void M4Scene::nextCommonCursor() {
 	int cursorIndex = _vm->_mouse->getCursorNum();
 
@@ -608,6 +602,7 @@
 MadsScene::MadsScene(MadsEngine *vm): Scene(vm) {
 	_vm = vm;
 
+	strcpy(_statusText, "");
 	_interfaceSurface = new MadsInterfaceView(vm);
 	_currentAction = kVerbNone;
 }
@@ -705,10 +700,10 @@
 		sprintf(statusText, "%s %s\n", _madsVm->globals()->getVocab(verbId), currentHotSpot->getVocab());
 
 		statusText[0] = toupper(statusText[0]);	// capitalize first letter
-		setMADSStatusText(statusText);
+		setStatusText(statusText);
 	} else {
 		_vm->_mouse->setCursorNum(0);
-		setMADSStatusText("");
+		setStatusText("");
 	}
 }
 
@@ -723,7 +718,7 @@
 		}
 
 		statusText[0] = toupper(statusText[0]);	// capitalize first letter
-		setMADSStatusText(statusText);
+		setStatusText(statusText);
 	}
 }
 
@@ -754,344 +749,29 @@
 		_currentAction = action;
 	}
 
-	setMADSStatusText(statusText);
+	setStatusText(statusText);
 }
 
-/*--------------------------------------------------------------------------
- * MadsInterfaceView handles the user interface section at the bottom of
- * game screens in MADS games
- *--------------------------------------------------------------------------
- */
-
-MadsInterfaceView::MadsInterfaceView(MadsM4Engine *vm): InterfaceView(vm, Common::Rect(0, MADS_SURFACE_HEIGHT,
-														 vm->_screen->width(), vm->_screen->height())) {
-	_screenType = VIEWID_INTERFACE;
-	_highlightedElement = -1;
-	_topIndex = 0;
-	_selectedObject = -1;
-	_cheatKeyCtr = 0;
-
-	_objectSprites = NULL;
-	_objectPalData = NULL;
-
-	/* Set up the rect list for screen elements */
-	// Actions
-	for (int i = 0; i < 10; ++i)
-		_screenObjects.addRect((i / 5) * 32 + 1, (i % 5) * 8 + MADS_SURFACE_HEIGHT + 2,
-			((i / 5) + 1) * 32 + 3, ((i % 5) + 1) * 8 + MADS_SURFACE_HEIGHT + 2);
-
-	// Scroller elements (up arrow, scroller, down arrow)
-	_screenObjects.addRect(73, 160, 82, 167);
-	_screenObjects.addRect(73, 168, 82, 190);
-	_screenObjects.addRect(73, 191, 82, 198);
-
-	// Inventory object names
-	for (int i = 0; i < 5; ++i)
-		_screenObjects.addRect(89, 158 + i * 8, 160, 166 + i * 8);
-
-	// Full rectangle area for all vocab actions
-	for (int i = 0; i < 5; ++i)
-		_screenObjects.addRect(239, 158 + i * 8, 320, 166 + i * 8);
+void MadsScene::setStatusText(const char *text) {
+	strcpy(_statusText, text);
 }
 
-MadsInterfaceView::~MadsInterfaceView() {
-	delete _objectSprites;
-}
+void MadsScene::update() {
+	_backgroundSurface->copyTo(this);
 
-void MadsInterfaceView::setFontMode(InterfaceFontMode newMode) {
-	switch (newMode) {
-	case ITEM_NORMAL:
-		_vm->_font->setColors(4, 4, 0xff);
-		break;
-	case ITEM_HIGHLIGHTED:
-		_vm->_font->setColors(5, 5, 0xff);
-		break;
-	case ITEM_SELECTED:
-		_vm->_font->setColors(6, 6, 0xff);
-		break;
-	}
-}
+	// Handle display of any status text
+	if (_statusText[0]) {
+		// Text colors are inverted in Dragonsphere
+		if (_vm->getGameType() == GType_DragonSphere)
+			_vm->_font->setColors(_vm->_palette->BLACK, _vm->_palette->WHITE, _vm->_palette->BLACK);
+		else
+			_vm->_font->setColors(_vm->_palette->WHITE, _vm->_palette->BLACK, _vm->_palette->BLACK);
 
-void MadsInterfaceView::initialise() {
-	// Build up the inventory list
-	_inventoryList.clear();
-
-	for (uint i = 0; i < _madsVm->globals()->getObjectsSize(); ++i) {
-		MadsObject *obj = _madsVm->globals()->getObject(i);
-		if (obj->roomNumber == PLAYER_INVENTORY)
-			_inventoryList.push_back(i);
+		_vm->_font->setFont(FONT_MAIN_MADS);
+		_vm->_font->writeString(this, _statusText, (width() - _vm->_font->getWidth(_statusText)) / 2, 142, 0);
 	}
 
-	// If the inventory has at least one object, select it
-	if (_inventoryList.size() > 0)
-		setSelectedObject(_inventoryList[0]);
+	_interfaceSurface->copyTo(this, 0, this->height() - _interfaceSurface->height());
 }
 
-void MadsInterfaceView::setSelectedObject(int objectNumber) {
-	char resName[80];
-
-	// Load inventory resource
-	if (_objectSprites) {
-		_vm->_palette->deleteRange(_objectPalData);
-		delete _objectSprites;
-	}
-
-	// Check to make sure the object is in the inventory, and also visible on-screen
-	int idx = _inventoryList.indexOf(objectNumber);
-	if (idx == -1) {
-		// Object wasn't found, so return
-		_selectedObject = -1;
-		return;
-	}
-
-	// Found the object
-	if (idx < _topIndex)
-		_topIndex = idx;
-	else if (idx >= (_topIndex + 5))
-		_topIndex = MAX(0, idx - 4);
-
-	_selectedObject = objectNumber;
-	sprintf(resName, "*OB%.3dI.SS", objectNumber);
-
-	Common::SeekableReadStream *data = _vm->res()->get(resName);
-	_objectSprites = new SpriteAsset(_vm, data, data->size(), resName);
-	_vm->res()->toss(resName);
-
-	// Slot it into available palette space
-	_objectPalData = _objectSprites->getRgbList();
-	_vm->_palette->addRange(_objectPalData);
-	_objectSprites->translate(_objectPalData, true);
-
-	_objectFrameNumber = 0;
-}
-
-void MadsInterfaceView::addObjectToInventory(int objectNumber) {
-	if (_inventoryList.indexOf(objectNumber) == -1) {
-		_madsVm->globals()->getObject(objectNumber)->roomNumber = PLAYER_INVENTORY;
-		_inventoryList.push_back(objectNumber);
-	}
-
-	setSelectedObject(objectNumber);
-}
-
-void MadsInterfaceView::onRefresh(RectList *rects, M4Surface *destSurface) {
-	_vm->_font->setFont(FONT_INTERFACE_MADS);
-	char buffer[100];
-
-	// Check to see if any dialog is currently active
-	bool dialogVisible = _vm->_viewManager->getView(LAYER_DIALOG) != NULL;
-
-	// Highlighting logic for action list
-	int actionIndex = 0;
-	for (int x = 0; x < 2; ++x) {
-		for (int y = 0; y < 5; ++y, ++actionIndex) {
-			// Determine the font colour depending on whether an item is selected. Note that the first action,
-			// 'Look', is always 'selected', even when another action is clicked on
-			setFontMode((_highlightedElement == actionIndex) ? ITEM_HIGHLIGHTED :
-				((actionIndex == 0) ? ITEM_SELECTED : ITEM_NORMAL));
-
-			// Get the verb action and capitalise it
-			const char *verbStr = _madsVm->globals()->getVocab(kVerbLook + actionIndex);
-			strcpy(buffer, verbStr);
-			if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
-
-			// Display the verb
-			const Common::Rect r(_screenObjects[actionIndex]);
-			_vm->_font->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
-		}
-	}
-
-	// Check for highlighting of the scrollbar controls
-	if ((_highlightedElement == SCROLL_UP) || (_highlightedElement == SCROLL_SCROLLER) || (_highlightedElement == SCROLL_DOWN)) {
-		// Highlight the control's borders
-		const Common::Rect r(_screenObjects[_highlightedElement]);
-		destSurface->frameRect(r, 5);
-	}
-
-	// Draw the horizontal line in the scroller representing the current top selected
-	const Common::Rect scroller(_screenObjects[SCROLL_SCROLLER]);
-	int yP = (_inventoryList.size() < 2) ? 0 : (scroller.height() - 5) * _topIndex / (_inventoryList.size() - 1);
-	destSurface->setColor(4);
-	destSurface->hLine(scroller.left + 2, scroller.right - 3, scroller.top + 2 + yP);
-
-	// List inventory items
-	for (uint i = 0; i < 5; ++i) {
-		if ((_topIndex + i) >= _inventoryList.size())
-			break;
-
-		const char *descStr = _madsVm->globals()->getVocab(_madsVm->globals()->getObject(
-			_inventoryList[_topIndex + i])->descId);
-		strcpy(buffer, descStr);
-		if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
-
-		const Common::Rect r(_screenObjects[INVLIST_START + i]);
-
-		// Set the highlighting of the inventory item
-		if (_highlightedElement == (int)(INVLIST_START + i)) setFontMode(ITEM_HIGHLIGHTED);
-		else if (_selectedObject == _inventoryList[_topIndex + i]) setFontMode(ITEM_SELECTED);
-		else setFontMode(ITEM_NORMAL);
-
-		// Write out it's description
-		_vm->_font->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
-	}
-
-	// Handle the display of any currently selected object
-	if (_objectSprites) {
-		// Display object sprite. Note that the frame number isn't used directly, because it would result
-		// in too fast an animation
-		M4Sprite *spr = _objectSprites->getFrame(_objectFrameNumber / INV_ANIM_FRAME_SPEED);
-		spr->copyTo(destSurface, INVENTORY_X, INVENTORY_Y, 0);
-
-		if (!_madsVm->globals()->invObjectsStill && !dialogVisible) {
-			// If objetcs are to animated, move to the next frame
-			if (++_objectFrameNumber >= (_objectSprites->getCount() * INV_ANIM_FRAME_SPEED))
-				_objectFrameNumber = 0;
-		}
-
-		// List the vocab actions for the currently selected object
-		MadsObject *obj = _madsVm->globals()->getObject(_selectedObject);
-		int yIndex = MIN(_highlightedElement - VOCAB_START, obj->vocabCount - 1);
-
-		for (int i = 0; i < obj->vocabCount; ++i) {
-			const Common::Rect r(_screenObjects[VOCAB_START + i]);
-
-			// Get the vocab description and capitalise it
-			const char *descStr = _madsVm->globals()->getVocab(obj->vocabList[i].vocabId);
-			strcpy(buffer, descStr);
-			if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
-
-			// Set the highlighting and display the entry
-			setFontMode((i == yIndex) ? ITEM_HIGHLIGHTED : ITEM_NORMAL);
-			_vm->_font->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
-		}
-	}
-}
-
-bool MadsInterfaceView::onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents) {
-	// If the mouse isn't being held down, then reset the repeated scroll timer
-	if (eventType != MEVENT_LEFT_HOLD)
-		_nextScrollerTicks = 0;
-
-	// Handle various event types
-	switch (eventType) {
-	case MEVENT_MOVE:
-		// If the cursor isn't in "wait mode", don't do any processing
-		if (_vm->_mouse->getCursorNum() == CURSOR_WAIT)
-			return true;
-
-		// Ensure the cursor is the standard arrow
-		_vm->_mouse->setCursorNum(CURSOR_ARROW);
-
-		// Check if any interface element is currently highlighted
-		_highlightedElement = _screenObjects.find(Common::Point(x, y));
-
-		return true;
-
-	case MEVENT_LEFT_CLICK:
-		// Left mouse click
-		// Check if an inventory object was selected
-		if ((_highlightedElement >= INVLIST_START) && (_highlightedElement < (INVLIST_START + 5))) {
-			// Ensure there is an inventory item listed in that cell
-			uint idx = _highlightedElement - INVLIST_START;
-			if ((_topIndex + idx) < _inventoryList.size()) {
-				// Set the selected object
-				setSelectedObject(_inventoryList[_topIndex + idx]);
-			}
-		} else if ((_highlightedElement >= ACTIONS_START) && (_highlightedElement < (ACTIONS_START + 10))) {
-			// A standard action was selected
-			_vm->_scene->setAction(kVerbLook + (_highlightedElement - ACTIONS_START));
-		} else if ((_highlightedElement >= VOCAB_START) && (_highlightedElement < (VOCAB_START + 5))) {
-			// A vocab action was selected
-			MadsObject *obj = _madsVm->globals()->getObject(_selectedObject);
-			int vocabIndex = MIN(_highlightedElement - VOCAB_START, obj->vocabCount - 1);
-			if (vocabIndex >= 0)
-				_vm->_scene->setAction(obj->vocabList[vocabIndex].vocabId, _selectedObject);
-		}
-
-		return true;
-
-	case MEVENT_LEFT_HOLD:
-		// Left mouse hold
-		// Handle the scroller - the up/down buttons allow for multiple actions whilst the mouse is held down
-		if ((_highlightedElement == SCROLL_UP) || (_highlightedElement == SCROLL_DOWN)) {
-			if ((_nextScrollerTicks == 0) || (g_system->getMillis() >= _nextScrollerTicks)) {
-				// Handle scroll up/down action
-				_nextScrollerTicks = g_system->getMillis() + SCROLLER_DELAY;
-
-				if ((_highlightedElement == SCROLL_UP) && (_topIndex > 0))
-					--_topIndex;
-				if ((_highlightedElement == SCROLL_DOWN) && (_topIndex < (int)(_inventoryList.size() - 1)))
-					++_topIndex;
-			}
-		}
-		return true;
-
-	case MEVENT_LEFT_DRAG:
-		// Left mouse drag
-		// Handle the the the scroller area that can be dragged to adjust the top displayed index
-		if (_highlightedElement == SCROLL_SCROLLER) {
-			// Calculate the new top index based on the Y position
-			const Common::Rect r(_screenObjects[SCROLL_SCROLLER]);
-			_topIndex = CLIP((int)(_inventoryList.size() - 1) * (y - r.top - 2) / (r.height() - 5),
-				0, (int)_inventoryList.size() - 1);
-		}
-		return true;
-
-	case KEVENT_KEY:
-		if (_cheatKeyCtr == CHEAT_SEQUENCE_MAX)
-			handleCheatKey(param1);
-		handleKeypress(param1);
-		return true;
-
-	default:
-		break;
-	}
-
-	return false;
-}
-
-bool MadsInterfaceView::handleCheatKey(int32 keycode) {
-	switch (keycode) {
-	case Common::KEYCODE_SPACE:
-		// TODO: Move player to current destination
-		return true;
-
-	case Common::KEYCODE_t | (Common::KEYCODE_LALT):
-	case Common::KEYCODE_t | (Common::KEYCODE_RALT):
-	{
-		// Teleport to room
-		//Scene *sceneView = (Scene *)vm->_viewManager->getView(VIEWID_SCENE);
-
-
-		return true;
-	}
-
-	default:
-		break;
-	}
-
-	return false;
-}
-
-const char *CHEAT_SEQUENCE = "widepipe";
-
-bool MadsInterfaceView::handleKeypress(int32 keycode) {
-	int flags = keycode >> 24;
-	int kc = keycode & 0xffff;
-
-	// Capitalise the letter if necessary
-	if (_cheatKeyCtr < CHEAT_SEQUENCE_MAX) {
-		if ((flags == Common::KBD_CTRL) && (kc == CHEAT_SEQUENCE[_cheatKeyCtr])) {
-			++_cheatKeyCtr;
-			if (_cheatKeyCtr == CHEAT_SEQUENCE_MAX)
-				Dialog::display(_vm, 22, cheatingEnabledDesc);
-			return true;
-		} else {
-			_cheatKeyCtr = 0;
-		}
-	}
-
-	return false;
-}
-
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-01-31 00:14:23 UTC (rev 47731)
+++ scummvm/trunk/engines/m4/scene.h	2010-01-31 00:42:47 UTC (rev 47732)
@@ -32,6 +32,9 @@
 #include "m4/hotspot.h"
 #include "m4/graphics.h"
 #include "m4/viewmgr.h"
+#include "m4/gui.h"
+#include "m4/m4_views.h"
+#include "m4/mads_views.h"
 
 namespace M4 {
 
@@ -83,10 +86,9 @@
 private:
 	byte *_inverseColorTable;
 	HotSpotList _sceneHotspots;
-	char _statusText[100];
 protected:
 	int _currentScene;
-	InterfaceView *_interfaceSurface;
+	GameInterfaceView *_interfaceSurface;
 	M4Surface *_backgroundSurface;
 	M4Surface *_codeSurface;
 	RGBList *_palData;
@@ -104,6 +106,8 @@
 	virtual void leftClick(int x, int y) = 0;
 	virtual void rightClick(int x, int y) = 0;
 	virtual void setAction(int action, int objectId = -1) = 0;
+	virtual void setStatusText(const char *text) = 0;
+	virtual void update() = 0;
 
 	// TODO: perhaps move playIntro() someplace else?
 	void playIntro();
@@ -117,11 +121,11 @@
 	int getCurrentScene() { return _currentScene; }
 	M4Surface *getBackgroundSurface() const { return _backgroundSurface; }
 	byte *getInverseColorTable() const { return _inverseColorTable; }
-	void update();
-	void setMADSStatusText(const char *text) { strcpy(_statusText, text); }
+	void showInterface();
+	void hideInterface();
 	void showMADSV2TextBox(char *text, int x, int y, char *faceName);
-	InterfaceView *getInterface() { return _interfaceSurface; }
-	SceneResources getSceneResources() { return _sceneResources; }
+	GameInterfaceView *getInterface() { return _interfaceSurface; };
+	SceneResources getSceneResources() { return _sceneResources; };
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
 	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
@@ -142,10 +146,15 @@
 	// Methods that differ between engines
 	virtual void loadScene(int sceneNumber);
 	virtual void loadSceneCodes(int sceneNumber, int index = 0);
+	virtual void show();
 	virtual void checkHotspotAtMousePos(int x, int y);
 	virtual void leftClick(int x, int y);
 	virtual void rightClick(int x, int y);
 	virtual void setAction(int action, int objectId = -1);
+	virtual void setStatusText(const char *text);
+	virtual void update();
+
+	M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; };
 };
 
 class MadsScene: public Scene {
@@ -153,6 +162,7 @@
 	MadsEngine *_vm;
 
 	int _currentAction;
+	char _statusText[100];
 public:
 	MadsScene(MadsEngine *vm);
 	virtual ~MadsScene() {};
@@ -165,63 +175,12 @@
 	virtual void leftClick(int x, int y);
 	virtual void rightClick(int x, int y);
 	virtual void setAction(int action, int objectId = -1);
-};
+	virtual void setStatusText(const char *text);
+	virtual void update();
 
-enum InterfaceFontMode {ITEM_NORMAL, ITEM_HIGHLIGHTED, ITEM_SELECTED};
-
-enum InterfaceObjects {ACTIONS_START = 0, SCROLL_UP = 10, SCROLL_SCROLLER = 11, SCROLL_DOWN = 12,
-		INVLIST_START = 13, VOCAB_START = 18};
-
-class IntegerList: public Common::Array<int> {
-public:
-	int indexOf(int v) {
-		for (uint i = 0; i < size(); ++i)
-			if (operator [](i) == v)
-				return i;
-		return -1;
-	}
+	MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; };
 };
 
-class InterfaceView: public View {
-public:
-	InterfaceView(MadsM4Engine *vm, const Common::Rect &bounds): View(vm, bounds) {};
-	~InterfaceView() {};
-
-	virtual void initialise() {};
-	virtual void setSelectedObject(int objectNumber) {};
-	virtual void addObjectToInventory(int objectNumber) {};
-};
-
-class MadsInterfaceView: public InterfaceView {
-private:
-	IntegerList _inventoryList;
-	RectList _screenObjects;
-	int _highlightedElement;
-	int _topIndex;
-	uint32 _nextScrollerTicks;
-	int _cheatKeyCtr;
-
-	// Object display fields
-	int _selectedObject;
-	SpriteAsset *_objectSprites;
-	RGBList *_objectPalData;
-	int _objectFrameNumber;
-
-	void setFontMode(InterfaceFontMode newMode);
-	bool handleCheatKey(int32 keycode);
-	bool handleKeypress(int32 keycode);
-public:
-	MadsInterfaceView(MadsM4Engine *vm);
-	~MadsInterfaceView();
-
-	virtual void initialise();
-	virtual void setSelectedObject(int objectNumber);
-	virtual void addObjectToInventory(int objectNumber);
-
-	void onRefresh(RectList *rects, M4Surface *destSurface);
-	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
-};
-
 } // End of namespace M4
 
 #endif


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

Revision: 47733
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47733&view=rev
Author:   dreammaster
Date:     2010-01-31 00:47:29 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Formatting corrections to conform to ScummVM formatting guidelines

Modified Paths:
--------------
    scummvm/trunk/engines/m4/console.h
    scummvm/trunk/engines/m4/converse.h
    scummvm/trunk/engines/m4/dialogs.h
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/gui.h
    scummvm/trunk/engines/m4/m4.h
    scummvm/trunk/engines/m4/m4_menus.h
    scummvm/trunk/engines/m4/m4_views.h
    scummvm/trunk/engines/m4/mads_anim.h
    scummvm/trunk/engines/m4/mads_menus.h
    scummvm/trunk/engines/m4/mads_views.h
    scummvm/trunk/engines/m4/resource.h
    scummvm/trunk/engines/m4/scene.h
    scummvm/trunk/engines/m4/sprite.h
    scummvm/trunk/engines/m4/viewmgr.h

Modified: scummvm/trunk/engines/m4/console.h
===================================================================
--- scummvm/trunk/engines/m4/console.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/console.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -33,7 +33,7 @@
 class MadsM4Engine;
 class MadsEngine;
 
-class Console: public GUI::Debugger {
+class Console : public GUI::Debugger {
 private:
 	MadsM4Engine *_vm;
 
@@ -58,7 +58,7 @@
 	virtual ~Console();
 };
 
-class MadsConsole: public Console {
+class MadsConsole : public Console {
 private:
 	MadsEngine *_vm;
 
@@ -69,7 +69,7 @@
 	virtual ~MadsConsole() {};
 };
 
-class M4Console: public Console {
+class M4Console : public Console {
 public:
 	M4Console(MadsM4Engine *vm): Console(vm) {};
 	virtual ~M4Console() {};

Modified: scummvm/trunk/engines/m4/converse.h
===================================================================
--- scummvm/trunk/engines/m4/converse.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/converse.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -135,7 +135,7 @@
 typedef Common::HashMap<Common::String,EntryInfo,Common::IgnoreCase_Hash,Common::IgnoreCase_EqualTo> OffsetHashMap;
 typedef Common::HashMap<Common::String,int32,Common::IgnoreCase_Hash,Common::IgnoreCase_EqualTo> ConvVarHashMap;
 
-class ConversationView: public View {
+class ConversationView : public View {
 public:
 	ConversationView(MadsM4Engine *vm);
 	~ConversationView();

Modified: scummvm/trunk/engines/m4/dialogs.h
===================================================================
--- scummvm/trunk/engines/m4/dialogs.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/dialogs.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -44,7 +44,7 @@
 
 typedef void (*GetValueFn)(MadsM4Engine *vm, int result);
 
-class Dialog: public View {
+class Dialog : public View {
 private:
 	Common::Array<DialogLine> _lines;
 	int _widthChars;

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/globals.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -196,7 +196,7 @@
 
 };
 
-class M4Globals: public Globals {
+class M4Globals : public Globals {
 private:
 	M4Engine *_vm;
 public:
@@ -206,7 +206,7 @@
 	bool invSuppressClickSound;
 };
 
-class MadsGlobals: public Globals {
+class MadsGlobals : public Globals {
 private:
 	struct MessageItem {
 		uint32 id;

Modified: scummvm/trunk/engines/m4/gui.h
===================================================================
--- scummvm/trunk/engines/m4/gui.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/gui.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -210,7 +210,7 @@
 
 enum MenuObjectState {OS_GREYED = 0, OS_NORMAL = 1, OS_MOUSEOVER = 2, OS_PRESSED = 3};
 
-class DialogView: public View {
+class DialogView : public View {
 public:
 	DialogView(MadsM4Engine *Vm, const Common::Rect &viewBounds, bool transparent = false):
 		View(Vm, viewBounds, transparent) {};
@@ -245,7 +245,7 @@
 	virtual void onRefresh() {}
 };
 
-class MenuObject: public GUIObject {
+class MenuObject : public GUIObject {
 public:
 	typedef void (*Callback)(DialogView *view, MenuObject *item);
 protected:
@@ -271,7 +271,7 @@
 	virtual bool onEvent(M4EventType event, int32 param, int x, int y, MenuObject *&currentItem) { return false; }
 };
 
-class MenuButton: public MenuObject {
+class MenuButton : public MenuObject {
 public:
 	MenuButton(DialogView *owner, int buttonId, int xs, int ys, int width, int height,
 		Callback callbackFn = NULL, bool greyed = false, bool transparent = false,
@@ -285,7 +285,7 @@
 enum MenuHorizSliderState {HSLIDER_THUMB_NORMAL = 0, HSLIDER_THUMB_MOUSEOVER = 1, HSLIDER_THUMB_PRESSED = 2};
 #define SLIDER_BAR_COLOR 129
 
-class MenuHorizSlider: public MenuObject {
+class MenuHorizSlider : public MenuObject {
 protected:
 	MenuHorizSliderState _sliderState;
 	Common::Point _thumbSize;
@@ -310,7 +310,7 @@
 	VSLIDER_DOWN      = 0x0050
 };
 
-class MenuVertSlider: public MenuObject {
+class MenuVertSlider : public MenuObject {
 protected:
 	MenuVertSliderState _sliderState;
 	Common::Point _thumbSize;
@@ -332,14 +332,14 @@
 	void setPercentage(int value);
 };
 
-class MenuMessage: public MenuObject {
+class MenuMessage : public MenuObject {
 public:
 	MenuMessage(DialogView *owner, int objectId, int x, int y, int w, int h, bool transparent = false);
 
 	void onRefresh();
 };
 
-class MenuImage: public MenuObject {
+class MenuImage : public MenuObject {
 private:
 	M4Surface *_sprite;
 public:
@@ -354,7 +354,7 @@
 	}
 };
 
-class MenuSaveLoadText: public MenuButton {
+class MenuSaveLoadText : public MenuButton {
 private:
 	bool _loadFlag;
 	const char *_displayText;
@@ -375,7 +375,7 @@
 	void setVisible(bool value);
 };
 
-class MenuTextField: public MenuObject {
+class MenuTextField : public MenuObject {
 private:
 	int _displayValue;
 	char _displayText[MAX_SAVEGAME_NAME];
@@ -395,7 +395,7 @@
 
 };
 
-class GUIRect: public GUIObject {
+class GUIRect : public GUIObject {
 private:
 	int _tag;
 public:
@@ -407,7 +407,7 @@
 
 enum GUIButtonState {BUTTON_NORMAL, BUTTON_MOUSEOVER, BUTTON_PRESSED};
 
-class GUIButton: public GUIRect {
+class GUIButton : public GUIRect {
 protected:
 	M4Surface *_normalSprite, *_mouseOverSprite, *_pressedSprite;
 	GUIButtonState _buttonState;
@@ -422,7 +422,7 @@
 	GUIButtonState getState() const { return _buttonState; }
 };
 
-class GUITextField: public GUIRect {
+class GUITextField : public GUIRect {
 private:
 	Common::String _text;
 public:
@@ -441,7 +441,7 @@
 	void keyMouseCollision() {}
 };
 
-class GameInterfaceView: public View {
+class GameInterfaceView : public View {
 public:
 	GameInterfaceView(MadsM4Engine *vm, const Common::Rect &rect): View(vm, rect) {};
 	~GameInterfaceView() {};

Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/m4.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -202,7 +202,7 @@
 	Scene *scene() { return _scene; };
 };
 
-class MadsEngine: public MadsM4Engine {
+class MadsEngine : public MadsM4Engine {
 public:
 	MadsEngine(OSystem *syst, const M4GameDescription *gameDesc);
 	virtual ~MadsEngine();
@@ -213,7 +213,7 @@
 	MadsScene *scene() { return (MadsScene *)_scene; };
 };
 
-class M4Engine: public MadsM4Engine {
+class M4Engine : public MadsM4Engine {
 public:
 	M4Engine(OSystem *syst, const M4GameDescription *gameDesc);
 	virtual ~M4Engine();

Modified: scummvm/trunk/engines/m4/m4_menus.h
===================================================================
--- scummvm/trunk/engines/m4/m4_menus.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/m4_menus.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -41,7 +41,7 @@
 
 typedef Common::List<MenuObject *> MenuObjectList;
 
-class OrionMenuView: public DialogView {
+class OrionMenuView : public DialogView {
 	typedef MenuObjectList::iterator MenuObjectsIterator;
 private:
 	MenuType _menuType;

Modified: scummvm/trunk/engines/m4/m4_views.h
===================================================================
--- scummvm/trunk/engines/m4/m4_views.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/m4_views.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -46,7 +46,7 @@
 	}
 };
 
-class GUIInventory: public GUIRect {
+class GUIInventory : public GUIRect {
 	typedef Common::List<Common::SharedPtr<GUIInventoryItem> > InventoryList;
 	typedef InventoryList::iterator ItemsIterator;
 private:
@@ -87,7 +87,7 @@
 	void setVisible(bool value) { _visible = value; }
 };
 
-class M4InterfaceView: public GameInterfaceView {
+class M4InterfaceView : public GameInterfaceView {
 	typedef Common::List<Common::SharedPtr<GUIButton> > ButtonList;
 	typedef ButtonList::iterator ButtonsIterator;
 public:

Modified: scummvm/trunk/engines/m4/mads_anim.h
===================================================================
--- scummvm/trunk/engines/m4/mads_anim.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/mads_anim.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -46,7 +46,7 @@
 
 typedef void (*TextviewCallback)(MadsM4Engine *vm);
 
-class TextviewView: public View {
+class TextviewView : public View {
 private:
 	bool _animating;
 
@@ -87,7 +87,7 @@
 
 typedef void (*AnimviewCallback)(MadsM4Engine *vm);
 
-class AAFile: public MadsPack {
+class AAFile : public MadsPack {
 public:
 	AAFile(const char *resourceName, MadsM4Engine* vm);
 
@@ -106,7 +106,7 @@
 
 enum AAFlags {AA_HAS_FONT = 0x20, AA_HAS_SOUND = 0x8000};
 
-class AnimviewView: public View {
+class AnimviewView : public View {
 private:
 	char _resourceName[80];
 	Common::SeekableReadStream *_script;

Modified: scummvm/trunk/engines/m4/mads_menus.h
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/mads_menus.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -34,7 +34,7 @@
 
 enum MadsGameAction {START_GAME, RESUME_GAME, SHOW_INTRO, CREDITS, QUOTES, EXIT};
 
-class RexMainMenuView: public View {
+class RexMainMenuView : public View {
 private:
 	M4Surface *_bgSurface;
 	RGBList *_bgPalData;
@@ -56,7 +56,7 @@
 	void updateState();
 };
 
-class DragonMainMenuView: public View {
+class DragonMainMenuView : public View {
 private:
 	//M4Surface *_bgSurface;
 	RGBList *_bgPalData;
@@ -78,7 +78,7 @@
 	void updateState();
 };
 
-class MadsMainMenuView: public View {
+class MadsMainMenuView : public View {
 public:
 	MadsMainMenuView(MadsM4Engine *vm);
 

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -34,7 +34,7 @@
 
 namespace M4 {
 
-class IntegerList: public Common::Array<int> {
+class IntegerList : public Common::Array<int> {
 public:
 	int indexOf(int v) {
 		for (uint i = 0; i < size(); ++i)
@@ -49,7 +49,7 @@
 enum InterfaceObjects {ACTIONS_START = 0, SCROLL_UP = 10, SCROLL_SCROLLER = 11, SCROLL_DOWN = 12,
 		INVLIST_START = 13, VOCAB_START = 18};
 
-class MadsInterfaceView: public GameInterfaceView {
+class MadsInterfaceView : public GameInterfaceView {
 private:
 	IntegerList _inventoryList;
 	RectList _screenObjects;

Modified: scummvm/trunk/engines/m4/resource.h
===================================================================
--- scummvm/trunk/engines/m4/resource.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/resource.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -112,7 +112,7 @@
 enum ResourceType {RESTYPE_ROOM, RESTYPE_SC, RESTYPE_TEXT, RESTYPE_QUO, RESTYPE_I,
 	RESTYPE_OB, RESTYPE_FONT, RESTYPE_SOUND, RESTYPE_SPEECH, RESTYPE_HAS_EXT, RESTYPE_NO_EXT};
 
-class MADSResourceManager: public ResourceManager {
+class MADSResourceManager : public ResourceManager {
 private:
 	ResourceType getResourceType(const char *resourceName);
 	const char *getResourceFilename(const char *resourceName);
@@ -123,7 +123,7 @@
 	bool resourceExists(const char *resourceName);
 };
 
-class M4ResourceManager: public ResourceManager {
+class M4ResourceManager : public ResourceManager {
 protected:
 	Common::SeekableReadStream *loadResource(const char *resourceName, bool loadFlag);
 public:

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/scene.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -82,7 +82,7 @@
 class MadsEngine;
 class InterfaceView;
 
-class Scene: public View {
+class Scene : public View {
 private:
 	byte *_inverseColorTable;
 	HotSpotList _sceneHotspots;
@@ -131,7 +131,7 @@
 	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
 };
 
-class M4Scene: public Scene {
+class M4Scene : public Scene {
 private:
 	M4Engine *_vm;
 	SpriteAsset *_sceneSprites;
@@ -157,7 +157,7 @@
 	M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; };
 };
 
-class MadsScene: public Scene {
+class MadsScene : public Scene {
 private:
 	MadsEngine *_vm;
 

Modified: scummvm/trunk/engines/m4/sprite.h
===================================================================
--- scummvm/trunk/engines/m4/sprite.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/sprite.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -100,7 +100,7 @@
 	uint32 reserved8;
 };
 
-class M4Sprite: public M4Surface {
+class M4Sprite : public M4Surface {
 public:
 	int x, y;
 	int xOffset, yOffset;

Modified: scummvm/trunk/engines/m4/viewmgr.h
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.h	2010-01-31 00:42:47 UTC (rev 47732)
+++ scummvm/trunk/engines/m4/viewmgr.h	2010-01-31 00:47:29 UTC (rev 47733)
@@ -76,7 +76,7 @@
 	_screenFlags.get = SCREVENT_ALL; _screenFlags.blocks = SCREVENT_ALL; \
 	_screenFlags.visible = true;
 
-class RectList: public Common::Array<Common::Rect> {
+class RectList : public Common::Array<Common::Rect> {
 public:
 	RectList();
 	~RectList();
@@ -107,7 +107,7 @@
 	View *_view;
 };
 
-class View: public M4Surface {
+class View : public M4Surface {
 public:
 	View(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent = false);
 	View(MadsM4Engine *vm, int x = 0, int y = 0, bool transparent = false);


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

Revision: 48030
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48030&view=rev
Author:   dreammaster
Date:     2010-02-10 11:11:31 +0000 (Wed, 10 Feb 2010)

Log Message:
-----------
Separated scene info console method between M4 and MADS classes, and cleaned up the message method

Modified Paths:
--------------
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/console.h
    scummvm/trunk/engines/m4/events.cpp

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2010-02-10 11:03:04 UTC (rev 48029)
+++ scummvm/trunk/engines/m4/console.cpp	2010-02-10 11:11:31 UTC (rev 48030)
@@ -36,7 +36,6 @@
 
 	DCmd_Register("scene",			WRAP_METHOD(Console, cmdLoadScene));
 	DCmd_Register("start",			WRAP_METHOD(Console, cmdStartingScene));
-	DCmd_Register("scene_info",		WRAP_METHOD(Console, cmdSceneInfo));
 	DCmd_Register("show_hotspots",	WRAP_METHOD(Console, cmdShowHotSpots));
 	DCmd_Register("list_hotspots",	WRAP_METHOD(Console, cmdListHotSpots));
 	DCmd_Register("play_sound",		WRAP_METHOD(Console, cmdPlaySound));
@@ -99,28 +98,6 @@
 	return false;
 }
 
-bool Console::cmdSceneInfo(int argc, const char **argv) {
-	DebugPrintf("Current scene is: %i\n", _vm->_scene->getCurrentScene());
-	if (_vm->isM4()) {
-		DebugPrintf("Scene resources:\n");
-		DebugPrintf("artBase: %s\n", _vm->_scene->getSceneResources().artBase);
-		DebugPrintf("pictureBase: %s\n", _vm->_scene->getSceneResources().pictureBase);
-		DebugPrintf("hotspotCount: %i\n", _vm->_scene->getSceneResources().hotspotCount);
-		DebugPrintf("parallaxCount: %i\n", _vm->_scene->getSceneResources().parallaxCount);
-		DebugPrintf("propsCount: %i\n", _vm->_scene->getSceneResources().propsCount);
-		DebugPrintf("frontY: %i\n", _vm->_scene->getSceneResources().frontY);
-		DebugPrintf("backY: %i\n", _vm->_scene->getSceneResources().backY);
-		DebugPrintf("frontScale: %i\n", _vm->_scene->getSceneResources().frontScale);
-		DebugPrintf("backScale: %i\n", _vm->_scene->getSceneResources().backScale);
-		DebugPrintf("depthTable: ");
-		for (uint i = 0; i < 16; i++)
-			DebugPrintf("%i ", _vm->_scene->getSceneResources().depthTable[i]);
-		DebugPrintf("\n");
-		DebugPrintf("railNodeCount: %i\n", _vm->_scene->getSceneResources().railNodeCount);
-	}
-	return true;
-}
-
 bool Console::cmdListHotSpots(int argc, const char **argv) {
 	DebugPrintf("Scene hotspots\n");
 	_vm->_scene->getSceneResources().hotspots->dump();
@@ -304,6 +281,7 @@
 
 	DCmd_Register("object",			WRAP_METHOD(MadsConsole, cmdObject));
 	DCmd_Register("message",		WRAP_METHOD(MadsConsole, cmdMessage));
+	DCmd_Register("scene_info",		WRAP_METHOD(MadsConsole, cmdSceneInfo));
 }
 
 bool MadsConsole::cmdObject(int argc, const char **argv) {
@@ -370,14 +348,14 @@
 		DebugPrintf("message 'objnum'\n");
 	else {
 		int messageIdx = strToInt(argv[1]);
-		if ((argc == 3) && !strcmp(argv[2], "id"))
+
+		if ((argc != 3) || (strcmp(argv[2], "idx") != NULL))
 			messageIdx = _vm->globals()->messageIndexOf(messageIdx);
 
-		if (messageIdx == -1)
-			DebugPrintf("Unknown message");
-		else
-		{
-			const char *msg = _vm->globals()->loadMessage(messageIdx);
+		const char *msg = _vm->globals()->loadMessage(messageIdx);
+		if (!msg)
+			DebugPrintf("Unknown message\n");
+		else {
 			Dialog *dlg = new Dialog(_vm, msg, "TEST DIALOG");
 
 			_vm->_viewManager->addView(dlg);
@@ -390,4 +368,40 @@
 	return true;
 }
 
+bool MadsConsole::cmdSceneInfo(int argc, const char **argv) {
+	DebugPrintf("Current scene is: %i\n", _vm->_scene->getCurrentScene());
+
+	return true;
+}
+
+/*--------------------------------------------------------------------------*/
+
+M4Console::M4Console(M4Engine *vm): Console(vm) {
+	_vm = vm;
+
+	DCmd_Register("scene_info",		WRAP_METHOD(M4Console, cmdSceneInfo));
+}
+
+bool M4Console::cmdSceneInfo(int argc, const char **argv) {
+	DebugPrintf("Current scene is: %i\n", _vm->_scene->getCurrentScene());
+
+	DebugPrintf("Scene resources:\n");
+	DebugPrintf("artBase: %s\n", _vm->_scene->getSceneResources().artBase);
+	DebugPrintf("pictureBase: %s\n", _vm->_scene->getSceneResources().pictureBase);
+	DebugPrintf("hotspotCount: %i\n", _vm->_scene->getSceneResources().hotspotCount);
+	DebugPrintf("parallaxCount: %i\n", _vm->_scene->getSceneResources().parallaxCount);
+	DebugPrintf("propsCount: %i\n", _vm->_scene->getSceneResources().propsCount);
+	DebugPrintf("frontY: %i\n", _vm->_scene->getSceneResources().frontY);
+	DebugPrintf("backY: %i\n", _vm->_scene->getSceneResources().backY);
+	DebugPrintf("frontScale: %i\n", _vm->_scene->getSceneResources().frontScale);
+	DebugPrintf("backScale: %i\n", _vm->_scene->getSceneResources().backScale);
+	DebugPrintf("depthTable: ");
+	for (uint i = 0; i < 16; i++)
+		DebugPrintf("%i ", _vm->_scene->getSceneResources().depthTable[i]);
+	DebugPrintf("\n");
+	DebugPrintf("railNodeCount: %i\n", _vm->_scene->getSceneResources().railNodeCount);
+
+	return true;
+}
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/console.h
===================================================================
--- scummvm/trunk/engines/m4/console.h	2010-02-10 11:03:04 UTC (rev 48029)
+++ scummvm/trunk/engines/m4/console.h	2010-02-10 11:11:31 UTC (rev 48030)
@@ -39,7 +39,6 @@
 
 	bool cmdLoadScene(int argc, const char **argv);
 	bool cmdStartingScene(int argc, const char **argv);
-	bool cmdSceneInfo(int argc, const char **argv);
 	bool cmdShowHotSpots(int argc, const char **argv);
 	bool cmdListHotSpots(int argc, const char **argv);
 	bool cmdPlaySound(int argc, const char **argv);
@@ -64,14 +63,19 @@
 
 	bool cmdObject(int argc, const char **argv);
 	bool cmdMessage(int argc, const char **argv);
+	bool cmdSceneInfo(int argc, const char **argv);
 public:
 	MadsConsole(MadsEngine *vm);
 	virtual ~MadsConsole() {};
 };
 
 class M4Console : public Console {
+private:
+	M4Engine *_vm;
+
+	bool cmdSceneInfo(int argc, const char **argv);
 public:
-	M4Console(MadsM4Engine *vm): Console(vm) {};
+	M4Console(M4Engine *vm);
 	virtual ~M4Console() {};
 };
 

Modified: scummvm/trunk/engines/m4/events.cpp
===================================================================
--- scummvm/trunk/engines/m4/events.cpp	2010-02-10 11:03:04 UTC (rev 48029)
+++ scummvm/trunk/engines/m4/events.cpp	2010-02-10 11:11:31 UTC (rev 48030)
@@ -52,7 +52,7 @@
 	_ctrlFlag = false;
 
 	if (_vm->isM4())
-		_console = new M4Console(_vm);
+		_console = new M4Console(_m4Vm);
 	else
 		_console = new MadsConsole(_madsVm);
 }


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

Revision: 48039
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48039&view=rev
Author:   dreammaster
Date:     2010-02-13 11:49:18 +0000 (Sat, 13 Feb 2010)

Log Message:
-----------
Added the beginnings of scene set-up logic

Modified Paths:
--------------
    scummvm/trunk/engines/m4/globals.cpp
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/graphics.cpp
    scummvm/trunk/engines/m4/graphics.h
    scummvm/trunk/engines/m4/module.mk
    scummvm/trunk/engines/m4/resource.cpp
    scummvm/trunk/engines/m4/resource.h
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h
    scummvm/trunk/engines/m4/sound.cpp
    scummvm/trunk/engines/m4/sound.h

Added Paths:
-----------
    scummvm/trunk/engines/m4/mads_logic.cpp
    scummvm/trunk/engines/m4/mads_logic.h

Modified: scummvm/trunk/engines/m4/globals.cpp
===================================================================
--- scummvm/trunk/engines/m4/globals.cpp	2010-02-13 11:45:54 UTC (rev 48038)
+++ scummvm/trunk/engines/m4/globals.cpp	2010-02-13 11:49:18 UTC (rev 48039)
@@ -278,6 +278,8 @@
 
 MadsGlobals::MadsGlobals(MadsEngine *vm): Globals(vm) {
 	_vm = vm;
+
+	playerSpriteChanged = false;
 }
 
 MadsGlobals::~MadsGlobals() {
@@ -408,6 +410,29 @@
 	return (char*)buffer;
 }
 
+/**
+ * Adds the specified scene number to list of scenes previously visited 
+ */
+void MadsGlobals::addVisitedScene(int sceneNumber) {
+	if (!isSceneVisited(sceneNumber))
+		_visitedScenes.push_back(sceneNumber);
+}
+
+/**
+ * Returns true if the specified scene has been previously visited
+ */
+bool MadsGlobals::isSceneVisited(int sceneNumber) {
+	Common::List<int>::iterator i;
+	for (i = _visitedScenes.begin(); i != _visitedScenes.end(); ++i)
+		if (*i == sceneNumber)
+			return true;
+	return false;
+}
+
+void MadsGlobals::removeVisitedScene(int sceneNumber) {
+	_visitedScenes.remove(sceneNumber);
+}
+
 /*--------------------------------------------------------------------------*/
 
 M4Globals::M4Globals(M4Engine *vm): Globals(vm) {

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2010-02-13 11:45:54 UTC (rev 48038)
+++ scummvm/trunk/engines/m4/globals.h	2010-02-13 11:49:18 UTC (rev 48039)
@@ -206,6 +206,8 @@
 	bool invSuppressClickSound;
 };
 
+enum RexPlayerSex { SEX_MALE = 0, SEX_FEMALE = 2, SEX_UNKNOWN = 1};
+
 class MadsGlobals : public Globals {
 private:
 	struct MessageItem {
@@ -220,15 +222,18 @@
 	Common::Array<char* > _madsQuotes;
 	Common::Array<MessageItem* > _madsMessages;
 	MadsObjectArray _madsObjects;
+	Common::List<int> _visitedScenes;
 public:
 	MadsGlobals(MadsEngine *vm);
 	~MadsGlobals();
 
 	// MADS variables
+	int _globals[TOTAL_NUM_VARIABLES];
 	bool easyMouse;
 	bool invObjectsStill;
 	bool textWindowStill;
 	int storyMode;
+	bool playerSpriteChanged;
 
 	void loadMadsVocab();
 	uint32 getVocabSize() { return _madsVocab.size(); }
@@ -250,6 +255,10 @@
 	void loadMadsObjects();
 	uint32 getObjectsSize() { return _madsObjects.size(); }
 	MadsObject *getObject(uint32 index) { return _madsObjects[index].get(); }
+
+	void addVisitedScene(int sceneNumber);
+	bool isSceneVisited(int sceneNumber);
+	void removeVisitedScene(int sceneNumber);
 };
 
 #define PLAYER_FIELD_LENGTH 40

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2010-02-13 11:45:54 UTC (rev 48038)
+++ scummvm/trunk/engines/m4/graphics.cpp	2010-02-13 11:49:18 UTC (rev 48039)
@@ -767,6 +767,11 @@
 	reset();
 }
 
+void Palette::setEntry(uint index, uint8 r, uint8 g, uint8 b) {
+	uint32 c = (r << 16) | (g << 8) || b;
+	g_system->setPalette((const byte *)&c, index, 1);
+}
+
 uint8 Palette::palIndexFromRgb(byte r, byte g, byte b, RGB8 *paletteData) {
 	byte index = 0;
 	int32 minDist = 0x7fffffff;

Modified: scummvm/trunk/engines/m4/graphics.h
===================================================================
--- scummvm/trunk/engines/m4/graphics.h	2010-02-13 11:45:54 UTC (rev 48038)
+++ scummvm/trunk/engines/m4/graphics.h	2010-02-13 11:49:18 UTC (rev 48039)
@@ -190,6 +190,7 @@
 	void grabPalette(RGB8 *colors, uint start, uint num) {
 		grabPalette((byte *)colors, start, num);
 	}
+	void setEntry(uint index, uint8 r, uint8 g, uint8 b);
 	uint8 palIndexFromRgb(byte r, byte g, byte b, RGB8 *paletteData = NULL);
 
 	void fadeToGreen(int numSteps, uint delayAmount);

Added: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	                        (rev 0)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-02-13 11:49:18 UTC (rev 48039)
@@ -0,0 +1,108 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "m4/m4.h"
+#include "m4/mads_logic.h"
+#include "m4/scene.h"
+
+namespace M4 {
+
+/*--------------------------------------------------------------------------*/
+
+const char *MadsSceneLogic::formAnimName(char sepChar, int suffixNum) {
+	return MADSResourceManager::getResourceName(sepChar, _sceneNumber, EXTTYPE_NONE, NULL, suffixNum);
+}
+
+void MadsSceneLogic::getSceneSpriteSet() {
+	char *setName = _madsVm->scene()->_playerSpriteName;
+	char oldName[100];
+	strcpy(oldName, setName);
+
+	// Room change sound
+	_madsVm->_sound->playSound(5);
+
+	// Set up sprite set prefix to use
+	if ((_sceneNumber <= 103) || (_sceneNumber == 111)) {
+		if (_madsVm->globals()->_globals[0] == SEX_FEMALE)
+			strcpy(setName, "ROX");
+		else
+			strcpy(setName, "RXM");
+	} else if (_sceneNumber <= 110) {
+		strcpy(setName, "RXSW");
+		_madsVm->globals()->_globals[0] = SEX_UNKNOWN;
+	} else if (_sceneNumber == 112)
+		strcpy(setName, "");
+
+	if (strcmp(setName, oldName) != 0)
+		_madsVm->globals()->playerSpriteChanged = true;
+
+	if ((_sceneNumber == 105)/* || ((_sceneNumber == 109) && (word_84800 != 0))*/)
+		_madsVm->globals()->playerSpriteChanged = true;
+
+	_vm->_palette->setEntry(16, 0x38, 0xFF, 0xFF);
+	_vm->_palette->setEntry(17, 0x38, 0xb4, 0xb4);
+}
+
+void MadsSceneLogic::getAnimName() {
+	const char *newName = MADSResourceManager::getAAName(
+		((_sceneNumber <= 103) || (_sceneNumber > 111)) ? 0 : 1);
+	strcpy(_madsVm->scene()->_aaName, newName);
+}
+
+/*--------------------------------------------------------------------------*/
+
+/**
+ * FIXME:
+ * Currently I'm only working at providing manual implementation of the first Rex Nebular scene.
+ * It will make more sense to convert the remaining game logic from the games into some
+ * kind of bytecode scripts
+ */
+
+void MadsSceneLogic::selectScene(int sceneNum) {
+	assert(sceneNum == 101);
+	_sceneNumber = sceneNum;
+
+
+}
+
+void MadsSceneLogic::setupScene() {
+	// FIXME: This is the hardcoded logic for Rex scene 101 only
+	const char *animName = formAnimName('A', -1);
+warning("anim - %s\n", animName);	
+//	sub_1e754(animName, 3);
+
+	getSceneSpriteSet();
+	getAnimName();
+}
+
+void MadsSceneLogic::enterScene() {
+
+}
+
+void MadsSceneLogic::doAction() {
+
+}
+
+}


Property changes on: scummvm/trunk/engines/m4/mads_logic.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: scummvm/trunk/engines/m4/mads_logic.h
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.h	                        (rev 0)
+++ scummvm/trunk/engines/m4/mads_logic.h	2010-02-13 11:49:18 UTC (rev 48039)
@@ -0,0 +1,54 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ * The MADS game logic is all hard-coded into the games, although for Rex at least
+ * it seems to use only a fairly basic set of instructions and function calls, so it should be 
+ * possible 
+ */
+
+#ifndef M4_MADS_LOGIC_H
+#define M4_MADS_LOGIC_H
+
+namespace M4 {
+
+class MadsSceneLogic {
+private:
+	// Library interface methods
+private:
+	int _sceneNumber;
+
+	// Support functions
+	const char *formAnimName(char sepChar, int suffixNum);
+	void getSceneSpriteSet();
+	void getAnimName();
+public:
+	void selectScene(int sceneNum);
+
+	void setupScene();
+	void enterScene();
+	void doAction();
+};
+
+}
+
+#endif


Property changes on: scummvm/trunk/engines/m4/mads_logic.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Modified: scummvm/trunk/engines/m4/module.mk
===================================================================
--- scummvm/trunk/engines/m4/module.mk	2010-02-13 11:45:54 UTC (rev 48038)
+++ scummvm/trunk/engines/m4/module.mk	2010-02-13 11:49:18 UTC (rev 48039)
@@ -19,6 +19,7 @@
 	m4_menus.o \
 	m4_views.o \
 	mads_anim.o \
+	mads_logic.o \
 	mads_menus.o \
 	mads_views.o \
 	midi.o \

Modified: scummvm/trunk/engines/m4/resource.cpp
===================================================================
--- scummvm/trunk/engines/m4/resource.cpp	2010-02-13 11:45:54 UTC (rev 48038)
+++ scummvm/trunk/engines/m4/resource.cpp	2010-02-13 11:49:18 UTC (rev 48039)
@@ -310,6 +310,71 @@
 	return outputFilename;
 }
 
+/**
+ * Forms a resource name based on the passed specifiers
+ */
+const char *MADSResourceManager::getResourceName(char asciiCh, int prefix, ExtensionType extType, 
+												 const char *suffix, int index) {
+	static char resourceName[100];
+
+	if (prefix <= 0)
+		strcpy(resourceName, "*");
+	else {
+		if (prefix < 100)
+			strcpy(resourceName, "*SC");
+		else
+			strcpy(resourceName, "*RM");
+		sprintf(resourceName + 3, "%.3d", prefix);
+	}
+
+	// Append the specified ascii prefix character
+	char asciiStr[2];
+	asciiStr[0] = asciiCh;
+	asciiStr[1] = '\0';
+	strcat(resourceName, asciiStr);
+
+	// Add in the index specified
+	if (index > 0)
+		sprintf(resourceName + strlen(resourceName), "%d", index);
+
+	// Add in any suffix
+	if (suffix)
+		strcat(resourceName, suffix);
+
+	// Handle extension types
+	switch (extType) {
+	case EXTTYPE_SS:
+		strcat(resourceName, ".SS");
+		break;
+	case EXTTYPE_AA:
+		strcat(resourceName, ".AA");
+		break;
+	case EXTTYPE_DAT:
+		strcat(resourceName, ".DAT");
+		break;
+	case EXTTYPE_HH:
+		strcat(resourceName, ".HH");
+		break;
+	case EXTTYPE_ART:
+		strcat(resourceName, ".ART");
+		break;
+	case EXTTYPE_INT:
+		strcat(resourceName, ".INT");
+		break;
+	default:
+		break;
+	}
+
+	return &resourceName[0];
+}
+
+/**
+ * Forms an AA resource name based on the given passed index
+ */
+const char *MADSResourceManager::getAAName(int index) {
+	return getResourceName('I', 0, EXTTYPE_AA, NULL, index);
+}
+
 Common::SeekableReadStream *MADSResourceManager::loadResource(const char *resourceName, bool loadFlag) {
 	Common::File hagFile;
 	uint32 offset = 0, size = 0;

Modified: scummvm/trunk/engines/m4/resource.h
===================================================================
--- scummvm/trunk/engines/m4/resource.h	2010-02-13 11:45:54 UTC (rev 48038)
+++ scummvm/trunk/engines/m4/resource.h	2010-02-13 11:49:18 UTC (rev 48039)
@@ -112,6 +112,9 @@
 enum ResourceType {RESTYPE_ROOM, RESTYPE_SC, RESTYPE_TEXT, RESTYPE_QUO, RESTYPE_I,
 	RESTYPE_OB, RESTYPE_FONT, RESTYPE_SOUND, RESTYPE_SPEECH, RESTYPE_HAS_EXT, RESTYPE_NO_EXT};
 
+enum ExtensionType {EXTTYPE_SS = 1, EXTTYPE_AA = 2, EXTTYPE_DAT = 3, EXTTYPE_HH = 4, EXTTYPE_ART = 5, 
+	EXTTYPE_INT = 6, EXTTYPE_NONE = -1};
+
 class MADSResourceManager : public ResourceManager {
 private:
 	ResourceType getResourceType(const char *resourceName);
@@ -121,6 +124,9 @@
 public:
 	MADSResourceManager(MadsM4Engine *vm): ResourceManager(vm) {};
 	bool resourceExists(const char *resourceName);
+
+	static const char *getResourceName(char asciiCh, int prefix, ExtensionType extType, const char *suffix, int index);
+	static const char *getAAName(int index);
 };
 
 class M4ResourceManager : public ResourceManager {

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-02-13 11:45:54 UTC (rev 48038)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-02-13 11:49:18 UTC (rev 48039)
@@ -603,6 +603,7 @@
 	_vm = vm;
 
 	strcpy(_statusText, "");
+	strcpy(_playerSpriteName, "");
 	_interfaceSurface = new MadsInterfaceView(vm);
 	_currentAction = kVerbNone;
 }
@@ -617,10 +618,10 @@
 	// Handle common scene setting
 	Scene::loadScene(sceneNumber);
 
+	_sceneLogic.selectScene(sceneNumber);
+	_vm->globals()->addVisitedScene(sceneNumber);
+	_sceneLogic.setupScene();
 
-	// TODO: Check if we were loading a game
-
-
 	// Set system palette entries
 	_vm->_palette->blockRange(0, 7);
 	RGB8 sysColors[3] = { {0x1f<<2, 0x2d<<2, 0x31<<2, 0}, {0x24<<2, 0x37<<2, 0x3a<<2, 0},

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-02-13 11:45:54 UTC (rev 48038)
+++ scummvm/trunk/engines/m4/scene.h	2010-02-13 11:49:18 UTC (rev 48039)
@@ -34,6 +34,7 @@
 #include "m4/viewmgr.h"
 #include "m4/gui.h"
 #include "m4/m4_views.h"
+#include "m4/mads_logic.h"
 #include "m4/mads_views.h"
 
 namespace M4 {
@@ -163,7 +164,12 @@
 
 	int _currentAction;
 	char _statusText[100];
+	MadsSceneLogic _sceneLogic;
+	SpriteAsset *_playerSprites;
 public:
+	char _playerSpriteName[100];
+	char _aaName[100];
+public:
 	MadsScene(MadsEngine *vm);
 	virtual ~MadsScene() {};
 

Modified: scummvm/trunk/engines/m4/sound.cpp
===================================================================
--- scummvm/trunk/engines/m4/sound.cpp	2010-02-13 11:45:54 UTC (rev 48038)
+++ scummvm/trunk/engines/m4/sound.cpp	2010-02-13 11:49:18 UTC (rev 48039)
@@ -99,6 +99,10 @@
 	_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &handle->handle, stream, -1, volume);
 }
 
+void Sound::playSound(int soundNum) { 
+	warning("TODO: playSound(%d)", soundNum); 
+}
+
 void Sound::pauseSound() {
 	for (int i = 0; i < SOUND_HANDLES; i++) {
 		if (_handles[i].type == kEffectHandle)

Modified: scummvm/trunk/engines/m4/sound.h
===================================================================
--- scummvm/trunk/engines/m4/sound.h	2010-02-13 11:45:54 UTC (rev 48038)
+++ scummvm/trunk/engines/m4/sound.h	2010-02-13 11:49:18 UTC (rev 48039)
@@ -77,6 +77,7 @@
 	~Sound();
 
 	void playSound(const char *soundName, int volume, bool loop, int channel = -1);
+	void playSound(int soundNum);
 	void pauseSound();
 	void resumeSound();
 	void stopSound(int channel = -1);


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

Revision: 48076
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48076&view=rev
Author:   dreammaster
Date:     2010-02-17 11:37:17 +0000 (Wed, 17 Feb 2010)

Log Message:
-----------
Implemented player sprite loading portion of scene enter code

Modified Paths:
--------------
    scummvm/trunk/engines/m4/assets.cpp
    scummvm/trunk/engines/m4/assets.h
    scummvm/trunk/engines/m4/mads_logic.cpp
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h

Modified: scummvm/trunk/engines/m4/assets.cpp
===================================================================
--- scummvm/trunk/engines/m4/assets.cpp	2010-02-17 04:20:19 UTC (rev 48075)
+++ scummvm/trunk/engines/m4/assets.cpp	2010-02-17 11:37:17 UTC (rev 48076)
@@ -26,6 +26,7 @@
 #include "m4/assets.h"
 #include "m4/globals.h"
 #include "m4/compression.h"
+#include "m4/graphics.h"
 
 namespace M4 {
 
@@ -99,6 +100,8 @@
 
 SpriteAsset::SpriteAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name, bool asStream) : BaseAsset(vm, stream, size, name) {
 	_stream = stream;
+	_palInterface = NULL;
+	_paletteData = NULL;
 
 	if (_vm->isM4()) {
 		loadM4SpriteAsset(vm, stream, asStream);
@@ -107,6 +110,19 @@
 	}
 }
 
+SpriteAsset::~SpriteAsset() {
+	if (_palInterface) {
+		// Internally stored palette translation data, so release it
+		_palInterface->deleteRange(_paletteData);
+		delete _paletteData;
+	}
+
+	// Delete the individual frames
+	for (Common::Array<SpriteAssetFrame>::iterator it = _frames.begin(); it != _frames.end(); ++it) {
+		delete (*it).frame;
+	}
+}
+
 void SpriteAsset::loadM4SpriteAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, bool asStream) {
 	bool isBigEndian = false;
 	uint32 frameOffset;
@@ -220,12 +236,6 @@
 	delete spriteDataStream;
 }
 
-SpriteAsset::~SpriteAsset() {
-	for (Common::Array<SpriteAssetFrame>::iterator it = _frames.begin(); it != _frames.end(); ++it) {
-		delete (*it).frame;
-	}
-}
-
 int32 SpriteAsset::parseSprite(bool isBigEndian) {
 
 	uint32 format, chunkType, chunkSize = 0;
@@ -325,6 +335,14 @@
 		_frames[frameIndex].frame->translate(list, isTransparent);
 }
 
+void SpriteAsset::translate(Palette *palette) {
+	_palInterface = palette;
+	_paletteData = this->getRgbList();
+	palette->addRange(_paletteData);
+	this->translate(_paletteData, true);
+}
+
+
 int32 SpriteAsset::getFrameSize(int index) {
 	/*
 	if (index + 1 == _frameCount) {

Modified: scummvm/trunk/engines/m4/assets.h
===================================================================
--- scummvm/trunk/engines/m4/assets.h	2010-02-17 04:20:19 UTC (rev 48075)
+++ scummvm/trunk/engines/m4/assets.h	2010-02-17 11:37:17 UTC (rev 48076)
@@ -45,6 +45,7 @@
 #define CELS___SS MKID_BE('  SS')	//'  SS'
 
 class MadsM4Engine;
+class Palette;
 
 class BaseAsset {
 public:
@@ -118,6 +119,7 @@
 	int getColorCount() { return _colorCount; }
 	RGBList *getRgbList();
 	void translate(RGBList *list, bool isTransparent = false);
+	void translate(Palette *palette);
 	int32 getFrameSize(int index);
 	M4Sprite *operator[](int index) { return getFrame(index); }
 protected:
@@ -133,6 +135,9 @@
 	Common::SeekableReadStream *_stream;
 	int32 parseSprite(bool isBigEndian = false);
 	void loadFrameHeader(SpriteAssetFrame &frameHeader, bool isBigEndian = false);
+private:
+	RGBList *_paletteData;
+	Palette *_palInterface;
 };
 
 enum AssetType {

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-02-17 04:20:19 UTC (rev 48075)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-02-17 11:37:17 UTC (rev 48076)
@@ -36,9 +36,7 @@
 }
 
 void MadsSceneLogic::getSceneSpriteSet() {
-	char *setName = _madsVm->scene()->_playerSpriteName;
-	char oldName[100];
-	strcpy(oldName, setName);
+	char prefix[100];
 
 	// Room change sound
 	_madsVm->_sound->playSound(5);
@@ -46,20 +44,20 @@
 	// Set up sprite set prefix to use
 	if ((_sceneNumber <= 103) || (_sceneNumber == 111)) {
 		if (_madsVm->globals()->_globals[0] == SEX_FEMALE)
-			strcpy(setName, "ROX");
+			strcpy(prefix, "ROX");
 		else
-			strcpy(setName, "RXM");
+			strcpy(prefix, "RXM");
 	} else if (_sceneNumber <= 110) {
-		strcpy(setName, "RXSW");
+		strcpy(prefix, "RXSW");
 		_madsVm->globals()->_globals[0] = SEX_UNKNOWN;
 	} else if (_sceneNumber == 112)
-		strcpy(setName, "");
+		strcpy(prefix, "");
 
-	if (strcmp(setName, oldName) != 0)
-		_madsVm->globals()->playerSpriteChanged = true;
+	_madsVm->globals()->playerSpriteChanged = true;
+	_madsVm->scene()->loadPlayerSprites(prefix);
 
-	if ((_sceneNumber == 105)/* || ((_sceneNumber == 109) && (word_84800 != 0))*/)
-		_madsVm->globals()->playerSpriteChanged = true;
+//	if ((_sceneNumber == 105) ((_sceneNumber == 109) && (word_84800 != 0)))
+//		_madsVm->globals()->playerSpriteChanged = true;
 
 	_vm->_palette->setEntry(16, 0x38, 0xFF, 0xFF);
 	_vm->_palette->setEntry(17, 0x38, 0xb4, 0xb4);

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-02-17 04:20:19 UTC (rev 48075)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-02-17 11:37:17 UTC (rev 48076)
@@ -55,22 +55,7 @@
 }
 
 Scene::~Scene() {
-	_sceneResources.hotspots->clear();
-	_sceneResources.parallax->clear();
-	_sceneResources.props->clear();
-
-	delete _sceneResources.hotspots;
-	delete _sceneResources.parallax;
-	delete _sceneResources.props;
-
-	delete _backgroundSurface;
-	delete _codeSurface;
-
-//	_vm->_palette->deleteAllRanges();
-
-	delete _palData;
-	delete _interfacePal;
-	delete[] _inverseColorTable;
+	leaveScene();
 }
 
 void Scene::loadScene(int sceneNumber) {
@@ -88,6 +73,12 @@
 	}
 }
 
+void Scene::leaveScene() {
+	delete _palData;
+	delete _interfacePal;
+	delete[] _inverseColorTable;
+}
+
 void Scene::show() {
 	_vm->_viewManager->addView(this);
 }
@@ -603,7 +594,6 @@
 	_vm = vm;
 
 	strcpy(_statusText, "");
-	strcpy(_playerSpriteName, "");
 	_interfaceSurface = new MadsInterfaceView(vm);
 	_currentAction = kVerbNone;
 }
@@ -664,6 +654,25 @@
 	_vm->res()->purge();
 }
 
+void MadsScene::leaveScene() {
+	_sceneResources.hotspots->clear();
+	_sceneResources.parallax->clear();
+	_sceneResources.props->clear();
+
+	delete _sceneResources.hotspots;
+	delete _sceneResources.parallax;
+	delete _sceneResources.props;
+
+	// Delete the sprites
+	for (uint i = 0; i <_sceneSprites.size(); ++i) delete _sceneSprites[i];
+	_sceneSprites.clear();
+
+	delete _backgroundSurface;
+	delete _codeSurface;
+
+	Scene::leaveScene();
+}
+
 void MadsScene::show() {
 	Scene::show();
 	_vm->_viewManager->addView(_interfaceSurface);
@@ -773,6 +782,35 @@
 	}
 
 	_interfaceSurface->copyTo(this, 0, this->height() - _interfaceSurface->height());
+
+	//***DEBUG***
+	_sceneSprites[0]->getFrame(1)->copyTo(this, 120, 90, 0);
 }
 
+void MadsScene::loadPlayerSprites(const char *prefix) {
+	const char suffixList[8] = { '8', '9', '6', '3', '2', '7', '4', '1' };
+	char setName[80];
+
+	strcpy(setName, "*");
+	strcat(setName, prefix);
+	strcat(setName, "_0.SS");
+	char *digitP = strchr(setName, '_') + 1;
+
+	for (int idx = 0; idx < 8; ++idx) {
+		*digitP = suffixList[idx];
+
+		if (_vm->res()->resourceExists(setName)) {
+			Common::SeekableReadStream *data = _vm->res()->get(setName);
+			SpriteAsset *playerSprites = new SpriteAsset(_vm, data, data->size(), setName);
+			playerSprites->translate(_vm->_palette);
+			_vm->res()->toss(setName);
+
+			_sceneSprites.push_back(playerSprites);
+			return;
+		}
+	}
+
+	error("Couldn't find player sprites");
+}
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-02-17 04:20:19 UTC (rev 48075)
+++ scummvm/trunk/engines/m4/scene.h	2010-02-17 11:37:17 UTC (rev 48076)
@@ -36,6 +36,7 @@
 #include "m4/m4_views.h"
 #include "m4/mads_logic.h"
 #include "m4/mads_views.h"
+#include "common/array.h"
 
 namespace M4 {
 
@@ -101,6 +102,7 @@
 
 	// Methods that differ between engines
 	virtual void loadScene(int sceneNumber);
+	virtual void leaveScene();
 	virtual void loadSceneCodes(int sceneNumber, int index = 0) = 0;
 	virtual void show();
 	virtual void checkHotspotAtMousePos(int x, int y) = 0;
@@ -146,6 +148,7 @@
 
 	// Methods that differ between engines
 	virtual void loadScene(int sceneNumber);
+	virtual void leaveScene() {};
 	virtual void loadSceneCodes(int sceneNumber, int index = 0);
 	virtual void show();
 	virtual void checkHotspotAtMousePos(int x, int y);
@@ -158,6 +161,8 @@
 	M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; };
 };
 
+typedef Common::Array<SpriteAsset *> SpriteAssetArray;
+
 class MadsScene : public Scene {
 private:
 	MadsEngine *_vm;
@@ -166,15 +171,15 @@
 	char _statusText[100];
 	MadsSceneLogic _sceneLogic;
 	SpriteAsset *_playerSprites;
+	SpriteAssetArray _sceneSprites;
 public:
-	char _playerSpriteName[100];
 	char _aaName[100];
 public:
 	MadsScene(MadsEngine *vm);
-	virtual ~MadsScene() {};
 
 	// Methods that differ between engines
 	virtual void loadScene(int sceneNumber);
+	virtual void leaveScene();
 	virtual void loadSceneCodes(int sceneNumber, int index = 0);
 	virtual void show();
 	virtual void checkHotspotAtMousePos(int x, int y);
@@ -184,6 +189,8 @@
 	virtual void setStatusText(const char *text);
 	virtual void update();
 
+	void loadPlayerSprites(const char *prefix);
+
 	MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; };
 };
 


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

Revision: 48099
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48099&view=rev
Author:   dreammaster
Date:     2010-02-21 01:18:03 +0000 (Sun, 21 Feb 2010)

Log Message:
-----------
Implemented some of the sprite animations loading logic for the first scene (no display yet)

Modified Paths:
--------------
    scummvm/trunk/engines/m4/mads_logic.cpp
    scummvm/trunk/engines/m4/mads_logic.h
    scummvm/trunk/engines/m4/resource.cpp
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-02-21 00:50:27 UTC (rev 48098)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-02-21 01:18:03 UTC (rev 48099)
@@ -31,7 +31,7 @@
 
 /*--------------------------------------------------------------------------*/
 
-const char *MadsSceneLogic::formAnimName(char sepChar, int suffixNum) {
+const char *MadsSceneLogic::formAnimName(char sepChar, int16 suffixNum) {
 	return MADSResourceManager::getResourceName(sepChar, _sceneNumber, EXTTYPE_NONE, NULL, suffixNum);
 }
 
@@ -71,6 +71,15 @@
 
 /*--------------------------------------------------------------------------*/
 
+uint16 MadsSceneLogic::loadSpriteSet(uint16 suffixNum, uint16 sepChar) {
+	assert(sepChar < 256);
+	const char *resName = formAnimName((char)sepChar, (int16)suffixNum);
+	return _madsVm->scene()->loadSceneSpriteSet(resName);
+}
+
+
+/*--------------------------------------------------------------------------*/
+
 /**
  * FIXME:
  * Currently I'm only working at providing manual implementation of the first Rex Nebular scene.
@@ -96,7 +105,15 @@
 }
 
 void MadsSceneLogic::enterScene() {
-
+	for (int i = 1; i <= 7; ++i)
+		_spriteIndexes[i - 1] = loadSpriteSet(i, 'x');
+	_spriteIndexes[7] = loadSpriteSet(0xFFFF, 'm');
+	_spriteIndexes[8] = loadSpriteSet(1, 'b');
+	_spriteIndexes[9] = loadSpriteSet(2, 'b');
+	_spriteIndexes[10] = loadSpriteSet(0, 'a');
+	_spriteIndexes[11] = loadSpriteSet(1, 'a');
+	_spriteIndexes[12] = loadSpriteSet(8, 'x');
+	_spriteIndexes[13] = loadSpriteSet(0, 'x');
 }
 
 void MadsSceneLogic::doAction() {

Modified: scummvm/trunk/engines/m4/mads_logic.h
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.h	2010-02-21 00:50:27 UTC (rev 48098)
+++ scummvm/trunk/engines/m4/mads_logic.h	2010-02-21 01:18:03 UTC (rev 48099)
@@ -34,11 +34,13 @@
 class MadsSceneLogic {
 private:
 	// Library interface methods
+	uint16 loadSpriteSet(uint16 suffixNum, uint16 sepChar);
 private:
 	int _sceneNumber;
+	uint16 _spriteIndexes[50];
 
 	// Support functions
-	const char *formAnimName(char sepChar, int suffixNum);
+	const char *formAnimName(char sepChar, int16 suffixNum);
 	void getSceneSpriteSet();
 	void getAnimName();
 public:

Modified: scummvm/trunk/engines/m4/resource.cpp
===================================================================
--- scummvm/trunk/engines/m4/resource.cpp	2010-02-21 00:50:27 UTC (rev 48098)
+++ scummvm/trunk/engines/m4/resource.cpp	2010-02-21 01:18:03 UTC (rev 48099)
@@ -334,7 +334,7 @@
 	strcat(resourceName, asciiStr);
 
 	// Add in the index specified
-	if (index > 0)
+	if (index >= 0)
 		sprintf(resourceName + strlen(resourceName), "%d", index);
 
 	// Add in any suffix

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-02-21 00:50:27 UTC (rev 48098)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-02-21 01:18:03 UTC (rev 48099)
@@ -608,10 +608,18 @@
 	// Handle common scene setting
 	Scene::loadScene(sceneNumber);
 
+	// Signal the script engine what scene is to be active
 	_sceneLogic.selectScene(sceneNumber);
-	_vm->globals()->addVisitedScene(sceneNumber);
 	_sceneLogic.setupScene();
 
+	// Add the scene if necessary to the list of scenes that have been visited
+	_vm->globals()->addVisitedScene(sceneNumber);
+
+
+	// Do any scene specific setup
+	_sceneLogic.enterScene();
+
+	/* Existing code that eventually needs to be replaced with the proper MADS code */
 	// Set system palette entries
 	_vm->_palette->blockRange(0, 7);
 	RGB8 sysColors[3] = { {0x1f<<2, 0x2d<<2, 0x31<<2, 0}, {0x24<<2, 0x37<<2, 0x3a<<2, 0},
@@ -787,6 +795,23 @@
 	_sceneSprites[0]->getFrame(1)->copyTo(this, 120, 90, 0);
 }
 
+int MadsScene::loadSceneSpriteSet(const char *setName) {
+	char resName[100];
+	strcpy(resName, setName);
+
+	// Append a '.SS' if it doesn't alreayd have an extension
+	if (!strchr(resName, '.'))
+		strcat(resName, ".SS");
+
+	Common::SeekableReadStream *data = _vm->res()->get(resName);
+	SpriteAsset *spriteSet = new SpriteAsset(_vm, data, data->size(), resName);
+	spriteSet->translate(_vm->_palette);
+	_vm->res()->toss(resName);
+
+	_sceneSprites.push_back(spriteSet);
+	return _sceneSprites.size() - 1;
+}
+
 void MadsScene::loadPlayerSprites(const char *prefix) {
 	const char suffixList[8] = { '8', '9', '6', '3', '2', '7', '4', '1' };
 	char setName[80];
@@ -800,12 +825,7 @@
 		*digitP = suffixList[idx];
 
 		if (_vm->res()->resourceExists(setName)) {
-			Common::SeekableReadStream *data = _vm->res()->get(setName);
-			SpriteAsset *playerSprites = new SpriteAsset(_vm, data, data->size(), setName);
-			playerSprites->translate(_vm->_palette);
-			_vm->res()->toss(setName);
-
-			_sceneSprites.push_back(playerSprites);
+			loadSceneSpriteSet(setName);
 			return;
 		}
 	}

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-02-21 00:50:27 UTC (rev 48098)
+++ scummvm/trunk/engines/m4/scene.h	2010-02-21 01:18:03 UTC (rev 48099)
@@ -189,6 +189,7 @@
 	virtual void setStatusText(const char *text);
 	virtual void update();
 
+	int loadSceneSpriteSet(const char *setName);
 	void loadPlayerSprites(const char *prefix);
 
 	MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; };


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

Revision: 48143
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48143&view=rev
Author:   dreammaster
Date:     2010-02-27 05:30:53 +0000 (Sat, 27 Feb 2010)

Log Message:
-----------
Beginnings of code for scene info loading

Modified Paths:
--------------
    scummvm/trunk/engines/m4/globals.cpp
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/resource.cpp
    scummvm/trunk/engines/m4/resource.h
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h

Modified: scummvm/trunk/engines/m4/globals.cpp
===================================================================
--- scummvm/trunk/engines/m4/globals.cpp	2010-02-27 02:49:27 UTC (rev 48142)
+++ scummvm/trunk/engines/m4/globals.cpp	2010-02-27 05:30:53 UTC (rev 48143)
@@ -511,6 +511,10 @@
 /*--------------------------------------------------------------------------*/
 
 MadsObject::MadsObject(Common::SeekableReadStream *stream) {
+	load(stream);
+}
+
+void MadsObject::load(Common::SeekableReadStream *stream) {
 	// Get the next data block
 	uint8 obj[0x30];
 	stream->read(obj, 0x30);
@@ -519,7 +523,7 @@
 	descId = READ_LE_UINT16(&obj[0]);
 	roomNumber = READ_LE_UINT16(&obj[2]);
 	article = (MADSArticles)obj[4];
-	vocabCount = obj[5];
+	vocabCount = obj[5] & 0x7f;
 	assert(vocabCount <= 3);
 
 	for (int i = 0; i < vocabCount; ++i) {

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2010-02-27 02:49:27 UTC (rev 48142)
+++ scummvm/trunk/engines/m4/globals.h	2010-02-27 05:30:53 UTC (rev 48143)
@@ -174,6 +174,7 @@
 public:
 	MadsObject() {};
 	MadsObject(Common::SeekableReadStream *stream);
+	void load(Common::SeekableReadStream *stream);
 	bool isInInventory() const { return roomNumber == PLAYER_INVENTORY; };
 
 	uint16 descId;

Modified: scummvm/trunk/engines/m4/resource.cpp
===================================================================
--- scummvm/trunk/engines/m4/resource.cpp	2010-02-27 02:49:27 UTC (rev 48142)
+++ scummvm/trunk/engines/m4/resource.cpp	2010-02-27 05:30:53 UTC (rev 48143)
@@ -369,6 +369,34 @@
 }
 
 /**
+ * Another variation for forming resource names
+ */
+const char *MADSResourceManager::getResourceName(ResourcePrefixType prefixType, int idx, const char *extension) {
+	static char resourceName[100];
+
+	strcpy(resourceName, "*");
+
+	if (extension) {
+		switch (prefixType) {
+		case RESPREFIX_GL:
+			strcat(resourceName, "GL000");
+			break;
+		case RESPREFIX_SC:
+		case RESPREFIX_RM:
+			strcat(resourceName, (prefixType == RESPREFIX_SC) ? "SC" : "RM");
+			sprintf(resourceName + 3, "%.3d", idx);
+			break;
+		default:
+			break;
+		}
+
+		strcat(resourceName, extension);
+	}
+
+	return &resourceName[0];
+}
+
+/**
  * Forms an AA resource name based on the given passed index
  */
 const char *MADSResourceManager::getAAName(int index) {

Modified: scummvm/trunk/engines/m4/resource.h
===================================================================
--- scummvm/trunk/engines/m4/resource.h	2010-02-27 02:49:27 UTC (rev 48142)
+++ scummvm/trunk/engines/m4/resource.h	2010-02-27 05:30:53 UTC (rev 48143)
@@ -115,6 +115,8 @@
 enum ExtensionType {EXTTYPE_SS = 1, EXTTYPE_AA = 2, EXTTYPE_DAT = 3, EXTTYPE_HH = 4, EXTTYPE_ART = 5, 
 	EXTTYPE_INT = 6, EXTTYPE_NONE = -1};
 
+enum ResourcePrefixType {RESPREFIX_GL = 1, RESPREFIX_SC = 2, RESPREFIX_RM = 3};
+
 class MADSResourceManager : public ResourceManager {
 private:
 	ResourceType getResourceType(const char *resourceName);
@@ -126,6 +128,7 @@
 	bool resourceExists(const char *resourceName);
 
 	static const char *getResourceName(char asciiCh, int prefix, ExtensionType extType, const char *suffix, int index);
+	static const char *getResourceName(ResourcePrefixType prefixType, int idx, const char *extension);
 	static const char *getAAName(int index);
 };
 

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-02-27 02:49:27 UTC (rev 48142)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-02-27 05:30:53 UTC (rev 48143)
@@ -59,6 +59,7 @@
 }
 
 void Scene::loadScene(int sceneNumber) {
+	_previousScene = _currentScene;
 	_currentScene = sceneNumber;
 
 	// Load scene background and set palette
@@ -596,29 +597,21 @@
 	strcpy(_statusText, "");
 	_interfaceSurface = new MadsInterfaceView(vm);
 	_currentAction = kVerbNone;
+	_spriteSlotsStart = 0;
 }
 
-void MadsScene::loadScene(int sceneNumber) {
-	// Close the menu if it's active
-	View *mainMenu = _vm->_viewManager->getView(VIEWID_MAINMENU);
-	if (mainMenu != NULL) {
-		_vm->_viewManager->deleteView(mainMenu);
-	}
+/**
+ * Secondary scene loading code
+ */
+void MadsScene::loadScene2(int sceneNumber, const char *aaName) {
 
-	// Handle common scene setting
-	Scene::loadScene(sceneNumber);
+	_sceneInfo.load(sceneNumber);
+}
 
-	// Signal the script engine what scene is to be active
-	_sceneLogic.selectScene(sceneNumber);
-	_sceneLogic.setupScene();
-
-	// Add the scene if necessary to the list of scenes that have been visited
-	_vm->globals()->addVisitedScene(sceneNumber);
-
-
-	// Do any scene specific setup
-	_sceneLogic.enterScene();
-
+/**
+ * Existing ScummVM code that needs to be eventually replaced with MADS code
+ */
+void MadsScene::loadSceneTemporary() {
 	/* Existing code that eventually needs to be replaced with the proper MADS code */
 	// Set system palette entries
 	_vm->_palette->blockRange(0, 7);
@@ -626,11 +619,11 @@
 		{0x00<<2, 0x10<<2, 0x16<<2, 0}};
 	_vm->_palette->setPalette(&sysColors[0], 4, 3);
 
-	_backgroundSurface->loadBackground(sceneNumber, &_palData);
+	_backgroundSurface->loadBackground(_currentScene, &_palData);
 	_vm->_palette->addRange(_palData);
 	_backgroundSurface->translate(_palData);
 
-	if (sceneNumber < 900) {
+	if (_currentScene < 900) {
 		/*_backgroundSurface->fillRect(Common::Rect(0, MADS_SURFACE_HEIGHT,
 			_backgroundSurface->width(), _backgroundSurface->height()),
 			_vm->_palette->BLACK);*/
@@ -644,20 +637,47 @@
 	}
 
 	// Don't load other screen resources for system screens
-	if (sceneNumber >= 900)
+	if (_currentScene >= 900)
 		return;
 
-	loadSceneHotSpotsMads(sceneNumber);
+	loadSceneHotSpotsMads(_currentScene);
 
 	// TODO: set walker scaling
 	// TODO: destroy woodscript buffer
 
 	// Load scene walk path file (*.COD/*.WW?)
-	loadSceneCodes(sceneNumber);
+	loadSceneCodes(_currentScene);
 
 	// Load inverse color table file (*.IPL)
-	loadSceneInverseColorTable(sceneNumber);
+	loadSceneInverseColorTable(_currentScene);
+}
 
+void MadsScene::loadScene(int sceneNumber) {
+	// Close the menu if it's active
+	View *mainMenu = _vm->_viewManager->getView(VIEWID_MAINMENU);
+	if (mainMenu != NULL) {
+		_vm->_viewManager->deleteView(mainMenu);
+	}
+
+	// Handle common scene setting
+	Scene::loadScene(sceneNumber);
+
+	// Signal the script engine what scene is to be active
+	_sceneLogic.selectScene(sceneNumber);
+	_sceneLogic.setupScene();
+
+	// Add the scene if necessary to the list of scenes that have been visited
+	_vm->globals()->addVisitedScene(sceneNumber);
+
+	// Secondary scene load routine
+	loadScene2(sceneNumber, "*I0.AA");
+
+	// Do any scene specific setup
+	_sceneLogic.enterScene();
+
+	// Existing ScummVM code that needs to be eventually replaced with MADS code
+	loadSceneTemporary();
+
 	// Purge resources
 	_vm->res()->purge();
 }
@@ -774,9 +794,71 @@
 	strcpy(_statusText, text);
 }
 
+/**
+ * Draws all the elements of the scene
+ */
+void MadsScene::drawElements() {
+	
+	// Display animations
+	for (int idx = 0; idx < _spriteSlotsStart; ++idx) {
+		
+	}
+
+
+	// Text display loop
+	for (int idx = 0; idx < TEXT_DISPLAY_SIZE; ++idx) {
+		if (_textDisplay[idx].active && (_textDisplay[idx].field_A >= 0)) {
+			_textDisplay[idx].font->setColours(0xFF, (_textDisplay[idx].colour2 == 0) ? 
+				_textDisplay[idx].colour1 : _textDisplay[idx].colour2, _textDisplay[idx].colour1);
+			_textDisplay[idx].font->writeString(this, _textDisplay[idx].message, 
+				_textDisplay[idx].bounds.left, _textDisplay[idx].bounds.top, 
+				width() - _textDisplay[idx].bounds.left, _textDisplay[idx].spacing);
+		}
+	}
+
+	// Copy the user interface surface onto the surface
+	_interfaceSurface->copyTo(this, 0, this->height() - _interfaceSurface->height());
+
+/*
+	// At this point, in the original engine, the dirty/changed areas were copied to the screen. At the moment,
+	// the current M4 engine framework doesn't support dirty areas, but this is being kept in case that ever changes
+	for (int idx = 0; idx < DIRTY_AREA_SIZE; ++idx) {
+		if (_dirtyAreas[idx].active && _dirtyAreas[idx].active2 && 
+			(_dirtyAreas[idx].bounds.width() > 0) && (_dirtyAreas[idx].bounds.height() > 0)) {
+			// Copy changed area to screen
+
+		}
+	}
+*/
+
+	// Some kind of copying over of slot entries
+	for (int idx = 0, idx2 = 0; idx < _spriteSlotsStart; ++idx) {
+		if (_spriteSlots[idx].spriteId >= 0) {
+			if (idx != idx2) {
+				// Copy over the slot entry
+				_spriteSlots[idx2] = _spriteSlots[idx];
+			}
+			++idx2;
+		}
+	}
+
+	// Clear up any now inactive text display entries
+	for (int idx = 0; idx < TEXT_DISPLAY_SIZE; ++idx) {
+		if (_textDisplay[idx].field_A < 0) {
+			_textDisplay[idx].active = false;
+			_textDisplay[idx].field_A = 0;
+		}
+	}
+}
+
+
 void MadsScene::update() {
+	// Copy the bare scene in
 	_backgroundSurface->copyTo(this);
 
+	// Draw all the various elements
+	drawElements();
+
 	// Handle display of any status text
 	if (_statusText[0]) {
 		// Text colors are inverted in Dragonsphere
@@ -789,8 +871,6 @@
 		_vm->_font->writeString(this, _statusText, (width() - _vm->_font->getWidth(_statusText)) / 2, 142, 0);
 	}
 
-	_interfaceSurface->copyTo(this, 0, this->height() - _interfaceSurface->height());
-
 	//***DEBUG***
 	_sceneSprites[0]->getFrame(1)->copyTo(this, 120, 90, 0);
 }
@@ -833,4 +913,34 @@
 	error("Couldn't find player sprites");
 }
 
+/*--------------------------------------------------------------------------*/
+
+void MadsSceneInfo::load(int sceneId) {
+	const char *sceneInfoStr = MADSResourceManager::getResourceName(RESPREFIX_RM, sceneId, ".DAT");
+	Common::SeekableReadStream *rawStream = _vm->_resourceManager->get(sceneInfoStr);
+	MadsPack sceneInfo(rawStream);
+	Common::SeekableReadStream *stream = sceneInfo.getItemStream(0);
+
+	int resSceneId = stream->readUint16LE();
+	assert(resSceneId == sceneId);
+
+	artFileNum = stream->readUint16LE();
+	field_4 = stream->readUint16LE();
+	width = stream->readUint16LE();
+	height = stream->readUint16LE();
+	assert((width == 320) && (height == 156));
+	
+	stream->skip(24);
+
+	objectCount = stream->readUint16LE();
+
+	stream->skip(40);
+
+	for (int i = 0; i < objectCount; ++i) {
+		objects[i].load(stream);
+	}
+
+	_vm->_resourceManager->toss(sceneInfoStr);
+}
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-02-27 02:49:27 UTC (rev 48142)
+++ scummvm/trunk/engines/m4/scene.h	2010-02-27 05:30:53 UTC (rev 48143)
@@ -29,6 +29,7 @@
 class View;
 
 #include "m4/assets.h"
+#include "m4/font.h"
 #include "m4/hotspot.h"
 #include "m4/graphics.h"
 #include "m4/viewmgr.h"
@@ -90,6 +91,7 @@
 	HotSpotList _sceneHotspots;
 protected:
 	int _currentScene;
+	int _previousScene;
 	GameInterfaceView *_interfaceSurface;
 	M4Surface *_backgroundSurface;
 	M4Surface *_codeSurface;
@@ -161,8 +163,48 @@
 	M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; };
 };
 
+struct SpriteSlot {
+	int16 spriteId;
+	int16 scale;
+	uint16 spriteListIndex;
+};
+
+struct TextDisplay {
+	bool active;
+	int spacing;
+	Common::Rect bounds;
+	int16 field_A;
+	uint8 colour1, colour2;
+	Font *font;
+	char message[100];
+};
+
+struct DirtyArea {
+	bool active;
+	bool active2;
+	Common::Rect bounds;
+};
+
+class MadsSceneInfo {
+public:
+	int sceneId;
+	int artFileNum;
+	int field_4;
+	int width;
+	int height;
+
+	int objectCount;
+	MadsObject objects[32];
+
+	void load(int sceneId);	
+};
+
 typedef Common::Array<SpriteAsset *> SpriteAssetArray;
 
+#define SPRITE_SLOTS_SIZE 50
+#define TEXT_DISPLAY_SIZE 40
+#define DIRTY_AREA_SIZE 90
+
 class MadsScene : public Scene {
 private:
 	MadsEngine *_vm;
@@ -170,8 +212,17 @@
 	int _currentAction;
 	char _statusText[100];
 	MadsSceneLogic _sceneLogic;
+	MadsSceneInfo _sceneInfo;
 	SpriteAsset *_playerSprites;
 	SpriteAssetArray _sceneSprites;
+	SpriteSlot _spriteSlots[50];
+	TextDisplay _textDisplay[TEXT_DISPLAY_SIZE];
+	DirtyArea _dirtyAreas[DIRTY_AREA_SIZE];
+	int _spriteSlotsStart;
+
+	void drawElements();
+	void loadScene2(int sceneNumber, const char *aaName);
+	void loadSceneTemporary();
 public:
 	char _aaName[100];
 public:


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

Revision: 48150
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48150&view=rev
Author:   dreammaster
Date:     2010-02-28 01:07:25 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
Implemented loading of the Rex Nebular walkable areas

Modified Paths:
--------------
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2010-02-27 18:54:21 UTC (rev 48149)
+++ scummvm/trunk/engines/m4/console.cpp	2010-02-28 01:07:25 UTC (rev 48150)
@@ -137,10 +137,7 @@
 }
 
 bool Console::cmdShowCodes(int argc, const char **argv) {
-	if (_vm->getGameType() != GType_RexNebular)
-		_vm->_scene->showCodes();
-	else
-		DebugPrintf("Pathfinding codes not done yet for Rex Nebular");
+	_vm->_scene->showCodes();
 	return false;
 }
 

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-02-27 18:54:21 UTC (rev 48149)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-02-28 01:07:25 UTC (rev 48150)
@@ -46,12 +46,12 @@
 	_sceneResources.parallax = new HotSpotList();
 	_sceneResources.props = new HotSpotList();
 	_backgroundSurface = new M4Surface();
-	_codeSurface = new M4Surface();
+	_walkSurface = new M4Surface();
 	_palData = NULL;
 	_interfacePal = NULL;
 	_interfaceSurface = NULL;
 	_inverseColorTable = NULL;
-	_vm->_rails->setCodeSurface(_codeSurface);
+	_vm->_rails->setCodeSurface(_walkSurface);
 }
 
 Scene::~Scene() {
@@ -250,24 +250,28 @@
 	}
 }
 
-// Test function, shows all scene codes
+/**
+ * Debug function that shows the walkable areas by copying them over the current background surface
+ */
 void Scene::showCodes() {
-	uint8 *pixelData = _codeSurface->getBasePtr(0, 0);
-	for (int i = 0; i < _codeSurface->width() * _codeSurface->height(); i++)
-		if (pixelData[i] & 0x10)
-			pixelData[i] = 0xFF;
-		else
-			pixelData[i] = 0;
+	if (_vm->isM4()) {
+		// Show the walk areas for the M4 engine in black and white
+		const byte *srcP = (const byte *)_walkSurface->getBasePtr(0, 0);
+		byte *destP = _backgroundSurface->getBasePtr(0, 0);
+		
+		for (int i = 0; i < _walkSurface->width() * _walkSurface->height(); i++)
+			destP[i] = (srcP[i] & 0x10) ? 0xFF : 0;
 
-	byte colors[256 * 4];
-	memset(colors, 0, sizeof(colors));
-	colors[255 * 4 + 0] = 255;
-	colors[255 * 4 + 1] = 255;
-	colors[255 * 4 + 2] = 255;
-	_vm->_palette->setPalette(colors, 0, 256);
-
-	_backgroundSurface->copyFrom(_codeSurface, Common::Rect(0, 0, 640, 480), 0, 0);
-	//_system->copyRectToScreen(codes->getBasePtr(0, 0), codes->w, 0, 0, codes->w, codes->h);
+		byte colors[256 * 4];
+		memset(colors, 0, sizeof(colors));
+		colors[255 * 4 + 0] = 255;
+		colors[255 * 4 + 1] = 255;
+		colors[255 * 4 + 2] = 255;
+		_vm->_palette->setPalette(colors, 0, 256);
+	} else {
+		// For MADS, simply copy the walk data to the background, in whatever current palette is active
+		_walkSurface->copyTo(_backgroundSurface);
+	}
 }
 
 void Scene::playIntro() {
@@ -472,7 +476,7 @@
 
 	sprintf(filename, "%i.cod", sceneNumber);
 	sceneS = _vm->res()->openFile(filename);
-	_codeSurface->loadCodesM4(sceneS);
+	_walkSurface->loadCodesM4(sceneS);
 	_vm->res()->toss(filename);
 }
 
@@ -603,9 +607,12 @@
 /**
  * Secondary scene loading code
  */
-void MadsScene::loadScene2(int sceneNumber, const char *aaName) {
+void MadsScene::loadScene2(const char *aaName) {
+	// Load up the properties for the scene
+	_sceneInfo.load(_currentScene);
 
-	_sceneInfo.load(sceneNumber);
+	// Load scene walk paths
+	loadSceneCodes(_currentScene);
 }
 
 /**
@@ -645,9 +652,6 @@
 	// TODO: set walker scaling
 	// TODO: destroy woodscript buffer
 
-	// Load scene walk path file (*.COD/*.WW?)
-	loadSceneCodes(_currentScene);
-
 	// Load inverse color table file (*.IPL)
 	loadSceneInverseColorTable(_currentScene);
 }
@@ -670,7 +674,7 @@
 	_vm->globals()->addVisitedScene(sceneNumber);
 
 	// Secondary scene load routine
-	loadScene2(sceneNumber, "*I0.AA");
+	loadScene2("*I0.AA");
 
 	// Do any scene specific setup
 	_sceneLogic.enterScene();
@@ -696,7 +700,7 @@
 	_sceneSprites.clear();
 
 	delete _backgroundSurface;
-	delete _codeSurface;
+	delete _walkSurface;
 
 	Scene::leaveScene();
 }
@@ -714,10 +718,17 @@
 		sprintf(filename, "rm%i.ww%i", sceneNumber, index);
 		MadsPack walkData(filename, _vm);
 		sceneS = walkData.getItemStream(0);
-		_codeSurface->loadCodesMads(sceneS);
+		_walkSurface->loadCodesMads(sceneS);
 		_vm->res()->toss(filename);
 	} else if (_vm->getGameType() == GType_RexNebular) {
-		// TODO
+		// For Rex Nebular, the walk areas are part of the scene info
+		byte *destP = _walkSurface->getBasePtr(0, 0);
+		const byte *srcP = _sceneInfo.walkData;
+		byte runLength;
+		while ((runLength = *srcP++) != 0) {
+			Common::set_to(destP, destP + runLength, *srcP++);
+			destP += runLength;
+		}
 	}
 }
 
@@ -919,6 +930,8 @@
 	const char *sceneInfoStr = MADSResourceManager::getResourceName(RESPREFIX_RM, sceneId, ".DAT");
 	Common::SeekableReadStream *rawStream = _vm->_resourceManager->get(sceneInfoStr);
 	MadsPack sceneInfo(rawStream);
+
+	// Basic scene info
 	Common::SeekableReadStream *stream = sceneInfo.getItemStream(0);
 
 	int resSceneId = stream->readUint16LE();
@@ -940,6 +953,15 @@
 		objects[i].load(stream);
 	}
 
+	// For Rex Nebular, read in the scene's compressed walk surface information
+	if (_vm->getGameType() == GType_RexNebular) {
+		delete walkData;
+
+		stream = sceneInfo.getItemStream(1);
+		walkData = (byte *)malloc(stream->size());
+		stream->read(walkData, stream->size());
+	}
+
 	_vm->_resourceManager->toss(sceneInfoStr);
 }
 

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-02-27 18:54:21 UTC (rev 48149)
+++ scummvm/trunk/engines/m4/scene.h	2010-02-28 01:07:25 UTC (rev 48150)
@@ -94,7 +94,7 @@
 	int _previousScene;
 	GameInterfaceView *_interfaceSurface;
 	M4Surface *_backgroundSurface;
-	M4Surface *_codeSurface;
+	M4Surface *_walkSurface;
 	RGBList *_palData;
 	RGBList *_interfacePal;
 	SceneResources _sceneResources;
@@ -195,7 +195,12 @@
 
 	int objectCount;
 	MadsObject objects[32];
+	
+	int walkSize;
+	byte *walkData;
 
+	MadsSceneInfo() { walkSize = 0; walkData = NULL; }
+	~MadsSceneInfo() { delete walkData; }
 	void load(int sceneId);	
 };
 
@@ -221,7 +226,7 @@
 	int _spriteSlotsStart;
 
 	void drawElements();
-	void loadScene2(int sceneNumber, const char *aaName);
+	void loadScene2(const char *aaName);
 	void loadSceneTemporary();
 public:
 	char _aaName[100];


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

Revision: 48172
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48172&view=rev
Author:   dreammaster
Date:     2010-03-07 05:06:58 +0000 (Sun, 07 Mar 2010)

Log Message:
-----------
Split up the scene.cpp file into separate files for M4 and MADS specific scene code and support classes. Also have started adding code for textual display and proper current action display

Modified Paths:
--------------
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/converse.cpp
    scummvm/trunk/engines/m4/converse.h
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/m4.h
    scummvm/trunk/engines/m4/mads_views.h
    scummvm/trunk/engines/m4/module.mk
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h
    scummvm/trunk/engines/m4/script.cpp
    scummvm/trunk/engines/m4/staticres.cpp
    scummvm/trunk/engines/m4/staticres.h

Added Paths:
-----------
    scummvm/trunk/engines/m4/m4_scene.cpp
    scummvm/trunk/engines/m4/m4_scene.h
    scummvm/trunk/engines/m4/mads_scene.cpp
    scummvm/trunk/engines/m4/mads_scene.h

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2010-03-06 22:40:55 UTC (rev 48171)
+++ scummvm/trunk/engines/m4/console.cpp	2010-03-07 05:06:58 UTC (rev 48172)
@@ -214,8 +214,11 @@
 	if (argc != 2) {
 		DebugPrintf("Usage: %s <conversation file name>\n", argv[0]);
 		return true;
+	} else if (_vm->isM4()) {
+		((M4Engine *)_vm)->_converse->startConversation(argv[1]);
+		return false;
 	} else {
-		_vm->_converse->startConversation(argv[1]);
+		error("MADS engine does not support conversations yet");
 		return false;
 	}
 }

Modified: scummvm/trunk/engines/m4/converse.cpp
===================================================================
--- scummvm/trunk/engines/m4/converse.cpp	2010-03-06 22:40:55 UTC (rev 48171)
+++ scummvm/trunk/engines/m4/converse.cpp	2010-03-07 05:06:58 UTC (rev 48172)
@@ -103,7 +103,7 @@
 	_activeItems.clear();
 
 	if (nodeIndex != -1) {
-		ConvEntry *node = _vm->_converse->getNode(nodeIndex);
+		ConvEntry *node = _m4Vm->_converse->getNode(nodeIndex);
 
 		for (uint i = 0; i < node->entries.size(); ++i) {
 			if (!node->entries[i]->visible)
@@ -137,7 +137,7 @@
 			//printf("Current node falls through node at offset %i when entries are less or equal than %i\n",
 			//		node->fallthroughOffset, node->fallthroughMinEntries);
 			if (_activeItems.size() <= (uint32)node->fallthroughMinEntries) {
-				const EntryInfo *entryInfo = _vm->_converse->getEntryInfo(node->fallthroughOffset);
+				const EntryInfo *entryInfo = _m4Vm->_converse->getEntryInfo(node->fallthroughOffset);
 				//printf("Entries are less than or equal to %i, falling through to node at offset %i, index %i\n",
 				//		node->fallthroughMinEntries, node->fallthroughOffset, entryInfo->nodeIndex);
 				setNode(entryInfo->nodeIndex);
@@ -228,7 +228,7 @@
 	// Hide selected entry, unless it has a persistent flag set
 	if (!(_activeItems[entryIndex]->flags & kEntryPersists)) {
 		//printf("Hiding selected entry\n");
-		_vm->_converse->getNode(_currentNodeIndex)->entries[entryIndex]->visible = false;
+		_m4Vm->_converse->getNode(_currentNodeIndex)->entries[entryIndex]->visible = false;
 	} else {
 		//printf("Selected entry is persistent, not hiding it\n");
 	}
@@ -266,8 +266,8 @@
 		ConvEntry *currentEntry = _activeItems[_highlightedIndex]->entries[i];
 
 		if (currentEntry->isConditional) {
-			if (!_vm->_converse->evaluateCondition(
-				_vm->_converse->getValue(currentEntry->condition.offset),
+			if (!_m4Vm->_converse->evaluateCondition(
+				_m4Vm->_converse->getValue(currentEntry->condition.offset),
 				currentEntry->condition.op, currentEntry->condition.val))
 				continue;	// don't play this reply
 		}
@@ -315,7 +315,7 @@
 
 	//printf("Current selection does %i actions\n", _activeItems[entryIndex]->actions.size());
 	for (uint32 i = 0; i < _activeItems[_highlightedIndex]->actions.size(); i++) {
-		if (!_vm->_converse->performAction(_activeItems[_highlightedIndex]->actions[i]))
+		if (!_m4Vm->_converse->performAction(_activeItems[_highlightedIndex]->actions[i]))
 			break;
 	}	// end for
 
@@ -1220,4 +1220,14 @@
 	}	// end switch
 }
 
+/*--------------------------------------------------------------------------*/
+
+MadsConversation::MadsConversation() {
+	for (int i = 0; i < MADS_TALK_SIZE; ++i) {
+		_talkList[i].desc = NULL;
+		_talkList[i].id = 0;
+	}
+}
+
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/converse.h
===================================================================
--- scummvm/trunk/engines/m4/converse.h	2010-03-06 22:40:55 UTC (rev 48171)
+++ scummvm/trunk/engines/m4/converse.h	2010-03-07 05:06:58 UTC (rev 48172)
@@ -30,8 +30,8 @@
 #include "common/hashmap.h"
 
 #include "m4/globals.h"
-#include "m4/m4.h"
 #include "m4/viewmgr.h"
+#include "m4/sound.h"
 
 namespace M4 {
 
@@ -195,6 +195,23 @@
 	void setEntryInfo(int32 offset, EntryType type, int32 nodeIndex, int32 entryIndex);
 };
 
+
+struct MadsTalkEntry {
+	uint16 id;
+	const char *desc;
+};
+
+#define MADS_TALK_SIZE 5
+
+class MadsConversation {
+private:
+	MadsTalkEntry _talkList[MADS_TALK_SIZE];
+public:
+	MadsConversation();
+
+	MadsTalkEntry &operator[](int index) { return _talkList[index]; }
+};
+
 } // End of namespace M4
 
 #endif

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2010-03-06 22:40:55 UTC (rev 48171)
+++ scummvm/trunk/engines/m4/m4.cpp	2010-03-07 05:06:58 UTC (rev 48172)
@@ -137,7 +137,6 @@
 	delete _inventory;
 	delete _viewManager;
 	delete _rails;
-	delete _converse;
 	delete _script;
 	delete _ws;
 	delete _random;
@@ -178,7 +177,6 @@
 	_viewManager = new ViewManager(this);
 	_inventory = new Inventory(this);
 	_sound = new Sound(this, _mixer, 255);
-	_converse = new Converse(this);
 	_script = new ScriptInterpreter(this);
 	_ws = new WoodScript(this);
 	_animation = new Animation(this);
@@ -304,6 +302,7 @@
 M4Engine::~M4Engine() {
 	delete _resourceManager;
 	delete _globals;
+	delete _converse;
 }
 
 Common::Error M4Engine::run() {
@@ -316,6 +315,9 @@
 	// Set up needed common functionality
 	MadsM4Engine::run();
 
+	// M4 specific initialisation
+	_converse = new Converse(this);
+
 	_scene = new M4Scene(this);
 	_script->open("m4.dat");
 

Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h	2010-03-06 22:40:55 UTC (rev 48171)
+++ scummvm/trunk/engines/m4/m4.h	2010-03-07 05:06:58 UTC (rev 48172)
@@ -40,6 +40,8 @@
 #include "m4/events.h"
 #include "m4/font.h"
 #include "m4/scene.h"
+#include "m4/mads_scene.h"
+#include "m4/m4_scene.h"
 #include "m4/actor.h"
 #include "m4/sound.h"
 #include "m4/rails.h"
@@ -84,6 +86,7 @@
 class ConversationView;
 class Actor;
 class Converse;
+class MadsConversation;
 class ScriptInterpreter;
 class WoodScript;
 class Animation;
@@ -193,7 +196,6 @@
 	ConversationView *_conversationView;
 	Sound *_sound;
 	Rails *_rails;
-	Converse *_converse;
 	ScriptInterpreter *_script;
 	WoodScript *_ws;
 	Animation *_animation;
@@ -204,6 +206,8 @@
 
 class MadsEngine : public MadsM4Engine {
 public:
+	MadsConversation _converse;
+public:
 	MadsEngine(OSystem *syst, const M4GameDescription *gameDesc);
 	virtual ~MadsEngine();
 
@@ -215,6 +219,8 @@
 
 class M4Engine : public MadsM4Engine {
 public:
+	Converse *_converse;
+public:
 	M4Engine(OSystem *syst, const M4GameDescription *gameDesc);
 	virtual ~M4Engine();
 

Added: scummvm/trunk/engines/m4/m4_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_scene.cpp	                        (rev 0)
+++ scummvm/trunk/engines/m4/m4_scene.cpp	2010-03-07 05:06:58 UTC (rev 48172)
@@ -0,0 +1,226 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/system.h"
+
+#include "m4/dialogs.h"
+#include "m4/globals.h"
+#include "m4/scene.h"
+#include "m4/events.h"
+#include "m4/graphics.h"
+#include "m4/rails.h"
+#include "m4/font.h"
+#include "m4/m4_views.h"
+#include "m4/mads_views.h"
+#include "m4/compression.h"
+
+namespace M4 {
+
+M4Scene::M4Scene(M4Engine *vm): Scene(vm) {
+	_vm = vm;
+	_sceneSprites = NULL;
+	_interfaceSurface = new M4InterfaceView(vm);
+}
+
+M4Scene::~M4Scene() {
+	delete _sceneSprites;
+}
+
+void M4Scene::loadSceneSprites(int sceneNumber) {
+	char filename[kM4MaxFilenameSize];
+	sprintf(filename, "%i.ssb", sceneNumber);
+
+	Common::SeekableReadStream *sceneS = _vm->res()->get(filename);
+	_sceneSprites = new SpriteAsset(_vm, sceneS, sceneS->size(), filename);
+	_vm->res()->toss(filename);
+
+	printf("Scene has %d sprites, each one having %d colors\n", _sceneSprites->getCount(), _sceneSprites->getColorCount());
+}
+
+void M4Scene::loadScene(int sceneNumber) {
+	Scene::loadScene(sceneNumber);
+
+	_backgroundSurface->loadBackground(sceneNumber);
+	_palData = NULL;
+
+	if (_vm->getGameType() == GType_Burger &&
+			sceneNumber != TITLE_SCENE_BURGER && sceneNumber != MAINMENU_SCENE_BURGER)
+		setStatusText("");
+
+	// Load scene def file (*.CHK)
+	loadSceneResources(sceneNumber);
+	loadSceneInverseColorTable(sceneNumber);
+
+	// TODO: set walker scaling
+	// TODO: destroy woodscript buffer
+
+	// Load scene walk path file (*.COD/*.WW?)
+	loadSceneCodes(sceneNumber);
+
+	// Load inverse color table file (*.IPL)
+	loadSceneInverseColorTable(sceneNumber);
+
+	if (_vm->getGameType() != GType_Burger) {
+		// Load scene sprites file (*.SSB)
+		loadSceneSprites(sceneNumber);
+
+		// Load scene sprite codes file (*.SSC)
+		loadSceneSpriteCodes(sceneNumber);
+	}
+
+
+	if (sceneNumber != TITLE_SCENE_BURGER && sceneNumber != MAINMENU_SCENE_BURGER) {
+		_m4Vm->scene()->getInterface()->show();
+		showSprites();
+	}
+
+	// Purge resources
+	_vm->res()->purge();
+}
+
+void M4Scene::loadSceneCodes(int sceneNumber, int index) {
+	char filename[kM4MaxFilenameSize];
+	Common::SeekableReadStream *sceneS;
+
+	sprintf(filename, "%i.cod", sceneNumber);
+	sceneS = _vm->res()->openFile(filename);
+	_walkSurface->loadCodesM4(sceneS);
+	_vm->res()->toss(filename);
+}
+
+void M4Scene::show() {
+	Scene::show();
+	_vm->_viewManager->addView(_interfaceSurface);
+}
+
+void M4Scene::checkHotspotAtMousePos(int x, int y) {
+	if (_vm->getGameType() == GType_Riddle)
+		return;
+
+	// TODO: loads of things to do here, only the mouse cursor and the status
+	// text is changed for now
+
+	// Only scene hotspots are checked for now, not parallax/props, as the
+	// latter ones are not used by Orion Burger
+	HotSpot *currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
+	if (currentHotSpot != NULL && currentHotSpot->getActive()) {
+		if (_vm->_mouse->getCursorNum() != CURSOR_LOOK &&
+			_vm->_mouse->getCursorNum() != CURSOR_TAKE &&
+			_vm->_mouse->getCursorNum() != CURSOR_USE &&
+			_m4Vm->scene()->getInterface()->_inventory.getSelectedIndex() == -1) {
+			_vm->_mouse->setCursorNum(currentHotSpot->getCursor());
+		}
+		_m4Vm->scene()->getInterface()->setStatusText(currentHotSpot->getPrep());
+	} else {
+		if (_vm->_mouse->getCursorNum() != CURSOR_LOOK &&
+			_vm->_mouse->getCursorNum() != CURSOR_TAKE &&
+			_vm->_mouse->getCursorNum() != CURSOR_USE &&
+			_m4Vm->scene()->getInterface()->_inventory.getSelectedIndex() == -1) {
+			_vm->_mouse->setCursorNum(0);
+		} else {
+
+		}
+	}
+}
+
+void M4Scene::leftClick(int x, int y) {
+	if (_vm->getGameType() == GType_Burger) {
+		// Place a Wilbur sprite with the correct facing
+		HotSpot	*currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
+		if (currentHotSpot != NULL && currentHotSpot->getActive()) {
+			update();
+			_vm->_actor->setWalkerDirection(currentHotSpot->getFacing());
+			/*
+			int posX = currentHotSpot->getFeetX();
+			int posY = currentHotSpot->getFeetY() -
+					   scaleValue(_vm->_actor->getWalkerHeight(), _vm->_actor->getWalkerScaling(), 0);
+			//_vm->_actor->placeWalkerSpriteAt(0, posX, posY);
+			*/
+
+			// Player said.... (for scene scripts)
+			printf("Player said: %s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab());
+
+			// FIXME: This should be moved somewhere else, and is incomplete
+			if (_m4Vm->scene()->getInterface()->_inventory.getSelectedIndex() == -1) {
+				if (_vm->_mouse->getVerb() == NULL) {
+					strcpy(_vm->_player->verb, currentHotSpot->getVerb());
+				} else {
+					strcpy(_vm->_player->verb, _vm->_mouse->getVerb());
+				}
+			} else {
+				strcpy(_vm->_player->verb, _m4Vm->scene()->getInterface()->_inventory.getSelectedObjectName());
+			}
+			strcpy(_vm->_player->noun, currentHotSpot->getVocab());
+			strcpy(_vm->_player->object, "");
+			_vm->_player->commandReady = true;
+
+			printf("## Player said: %s %s\n", _vm->_player->verb, _vm->_player->noun);
+
+		}
+	}
+}
+
+void M4Scene::rightClick(int x, int y) {
+	if (_vm->getGameType() == GType_Burger) {
+		nextCommonCursor();
+		_m4Vm->scene()->getInterface()->_inventory.clearSelected();
+	}
+}
+
+void M4Scene::setAction(int action, int objectId) {
+}
+
+void M4Scene::setStatusText(const char *text) {
+	getInterface()->setStatusText(text);
+}
+
+void M4Scene::update() {
+
+}
+
+void M4Scene::nextCommonCursor() {
+	int cursorIndex = _vm->_mouse->getCursorNum();
+
+	switch (cursorIndex) {
+	case CURSOR_ARROW:
+		cursorIndex = CURSOR_LOOK;
+		break;
+	case CURSOR_LOOK:
+		cursorIndex = CURSOR_TAKE;
+		break;
+	case CURSOR_TAKE:
+		cursorIndex = CURSOR_USE;
+		break;
+	case CURSOR_USE:
+		cursorIndex = CURSOR_ARROW;
+		break;
+	default:
+		cursorIndex = CURSOR_ARROW;
+	}
+
+	_vm->_mouse->setCursorNum(cursorIndex);
+}
+
+} // End of namespace M4


Property changes on: scummvm/trunk/engines/m4/m4_scene.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: scummvm/trunk/engines/m4/m4_scene.h
===================================================================
--- scummvm/trunk/engines/m4/m4_scene.h	                        (rev 0)
+++ scummvm/trunk/engines/m4/m4_scene.h	2010-03-07 05:06:58 UTC (rev 48172)
@@ -0,0 +1,68 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef M4_M4_SCENE_H
+#define M4_M4_SCENE_H
+
+class View;
+
+#include "m4/scene.h"
+
+namespace M4 {
+
+#define TITLE_SCENE_BURGER 951		// 951 = intro, 901 = demo menu, 971 = first scene
+#define MAINMENU_SCENE_BURGER 903
+#define FIRST_SCENE 101
+
+class M4Scene : public Scene {
+private:
+	M4Engine *_vm;
+	SpriteAsset *_sceneSprites;
+	SpriteAsset *_walkerSprite;
+
+	void loadSceneSprites(int sceneNumber);
+	void nextCommonCursor();
+public:
+	M4Scene(M4Engine *vm);
+	virtual ~M4Scene();
+
+	// Methods that differ between engines
+	virtual void loadScene(int sceneNumber);
+	virtual void leaveScene() {};
+	virtual void loadSceneCodes(int sceneNumber, int index = 0);
+	virtual void show();
+	virtual void checkHotspotAtMousePos(int x, int y);
+	virtual void leftClick(int x, int y);
+	virtual void rightClick(int x, int y);
+	virtual void setAction(int action, int objectId = -1);
+	virtual void setStatusText(const char *text);
+	virtual void update();
+
+	M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; };
+};
+
+} // End of namespace M4
+
+#endif


Property changes on: scummvm/trunk/engines/m4/m4_scene.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	                        (rev 0)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-03-07 05:06:58 UTC (rev 48172)
@@ -0,0 +1,647 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/system.h"
+
+#include "m4/mads_scene.h"
+#include "m4/dialogs.h"
+#include "m4/globals.h"
+#include "m4/scene.h"
+#include "m4/events.h"
+#include "m4/graphics.h"
+#include "m4/rails.h"
+#include "m4/font.h"
+#include "m4/m4_views.h"
+#include "m4/mads_views.h"
+#include "m4/compression.h"
+#include "m4/staticres.h"
+
+namespace M4 {
+
+MadsScene::MadsScene(MadsEngine *vm): Scene(vm) {
+	_vm = vm;
+
+	strcpy(_statusText, "");
+	_interfaceSurface = new MadsInterfaceView(vm);
+	_spriteSlotsStart = 0;
+	for (int i = 0; i < 3; ++i)
+		actionNouns[i] = 0;
+}
+
+/**
+ * Secondary scene loading code
+ */
+void MadsScene::loadScene2(const char *aaName) {
+	// Load up the properties for the scene
+	_sceneInfo.load(_currentScene);
+
+	// Load scene walk paths
+	loadSceneCodes(_currentScene);
+}
+
+/**
+ * Existing ScummVM code that needs to be eventually replaced with MADS code
+ */
+void MadsScene::loadSceneTemporary() {
+	/* Existing code that eventually needs to be replaced with the proper MADS code */
+	// Set system palette entries
+	_vm->_palette->blockRange(0, 7);
+	RGB8 sysColors[3] = { {0x1f<<2, 0x2d<<2, 0x31<<2, 0}, {0x24<<2, 0x37<<2, 0x3a<<2, 0},
+		{0x00<<2, 0x10<<2, 0x16<<2, 0}};
+	_vm->_palette->setPalette(&sysColors[0], 4, 3);
+
+	_backgroundSurface->loadBackground(_currentScene, &_palData);
+	_vm->_palette->addRange(_palData);
+	_backgroundSurface->translate(_palData);
+
+	if (_currentScene < 900) {
+		/*_backgroundSurface->fillRect(Common::Rect(0, MADS_SURFACE_HEIGHT,
+			_backgroundSurface->width(), _backgroundSurface->height()),
+			_vm->_palette->BLACK);*/
+		// TODO: interface palette
+		_interfaceSurface->madsloadInterface(0, &_interfacePal);
+		_vm->_palette->addRange(_interfacePal);
+		_interfaceSurface->translate(_interfacePal);
+		_backgroundSurface->copyFrom(_interfaceSurface, Common::Rect(0, 0, 320, 44), 0, 200 - 44);
+
+		_interfaceSurface->initialise();
+	}
+
+	// Don't load other screen resources for system screens
+	if (_currentScene >= 900)
+		return;
+
+	loadSceneHotSpotsMads(_currentScene);
+
+	// TODO: set walker scaling
+	// TODO: destroy woodscript buffer
+
+	// Load inverse color table file (*.IPL)
+	loadSceneInverseColorTable(_currentScene);
+}
+
+void MadsScene::loadScene(int sceneNumber) {
+	// Close the menu if it's active
+	View *mainMenu = _vm->_viewManager->getView(VIEWID_MAINMENU);
+	if (mainMenu != NULL) {
+		_vm->_viewManager->deleteView(mainMenu);
+	}
+
+	// Handle common scene setting
+	Scene::loadScene(sceneNumber);
+
+	// Signal the script engine what scene is to be active
+	_sceneLogic.selectScene(sceneNumber);
+	_sceneLogic.setupScene();
+
+	// Add the scene if necessary to the list of scenes that have been visited
+	_vm->globals()->addVisitedScene(sceneNumber);
+
+	// Secondary scene load routine
+	loadScene2("*I0.AA");
+
+	// Do any scene specific setup
+	_sceneLogic.enterScene();
+
+	// Existing ScummVM code that needs to be eventually replaced with MADS code
+	loadSceneTemporary();
+
+	// Purge resources
+	_vm->res()->purge();
+}
+
+void MadsScene::leaveScene() {
+	_sceneResources.hotspots->clear();
+	_sceneResources.parallax->clear();
+	_sceneResources.props->clear();
+
+	delete _sceneResources.hotspots;
+	delete _sceneResources.parallax;
+	delete _sceneResources.props;
+
+	// Delete the sprites
+	for (uint i = 0; i <_sceneSprites.size(); ++i) delete _sceneSprites[i];
+	_sceneSprites.clear();
+
+	delete _backgroundSurface;
+	delete _walkSurface;
+
+	Scene::leaveScene();
+}
+
+void MadsScene::show() {
+	Scene::show();
+	_vm->_viewManager->addView(_interfaceSurface);
+}
+
+void MadsScene::loadSceneCodes(int sceneNumber, int index) {
+	char filename[kM4MaxFilenameSize];
+	Common::SeekableReadStream *sceneS;
+
+	if (_vm->getGameType() == GType_Phantom || _vm->getGameType() == GType_DragonSphere) {
+		sprintf(filename, "rm%i.ww%i", sceneNumber, index);
+		MadsPack walkData(filename, _vm);
+		sceneS = walkData.getItemStream(0);
+		_walkSurface->loadCodesMads(sceneS);
+		_vm->res()->toss(filename);
+	} else if (_vm->getGameType() == GType_RexNebular) {
+		// For Rex Nebular, the walk areas are part of the scene info
+		byte *destP = _walkSurface->getBasePtr(0, 0);
+		const byte *srcP = _sceneInfo.walkData;
+		byte runLength;
+		while ((runLength = *srcP++) != 0) {
+			Common::set_to(destP, destP + runLength, *srcP++);
+			destP += runLength;
+		}
+	}
+}
+
+void MadsScene::checkHotspotAtMousePos(int x, int y) {
+	HotSpot *currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
+	if (currentHotSpot != NULL) {
+		_vm->_mouse->setCursorNum(currentHotSpot->getCursor());
+
+		// This is the "easy" interface, which updates the status text when the mouse is moved
+		// TODO: toggle this code for easy/normal interface mode
+		char statusText[50];
+		int verbId = 0;//***DEBUG****_currentAction;
+		if (verbId == kVerbNone)
+			verbId = currentHotSpot->getVerbID();
+		if (verbId == kVerbNone)
+			verbId = kVerbWalkTo;
+
+		sprintf(statusText, "%s %s\n", _madsVm->globals()->getVocab(verbId), currentHotSpot->getVocab());
+
+		statusText[0] = toupper(statusText[0]);	// capitalize first letter
+		setStatusText(statusText);
+	} else {
+		_vm->_mouse->setCursorNum(0);
+		setStatusText("");
+	}
+}
+
+void MadsScene::leftClick(int x, int y) {
+	HotSpot *currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
+	if (currentHotSpot != NULL) {
+		char statusText[50];
+		if (currentHotSpot->getVerbID() != 0) {
+			sprintf(statusText, "%s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab());
+		} else {
+			sprintf(statusText, "%s %s\n", _madsVm->globals()->getVocab(kVerbWalkTo), currentHotSpot->getVocab());
+		}
+
+		statusText[0] = toupper(statusText[0]);	// capitalize first letter
+		setStatusText(statusText);
+	}
+}
+
+void MadsScene::rightClick(int x, int y) {
+	// ***DEBUG*** - sample dialog display
+	int idx = 3; //_madsVm->_globals->messageIndexOf(0x277a);
+	const char *msg = _madsVm->globals()->loadMessage(idx);
+	Dialog *dlg = new Dialog(_vm, msg, "TEST DIALOG");
+	_vm->_viewManager->addView(dlg);
+	_vm->_viewManager->moveToFront(dlg);
+}
+
+void MadsScene::setAction(int action, int objectId) {
+	VALIDATE_MADS;
+	char statusText[50];
+
+	error("todo");
+	// TODO: Actually executing actions directly for objects. Also, some object actions are special in that
+	// a second object can be selected, as in 'use gun to shoot person', with requires a target
+/*
+	// Set up the new action
+	strcpy(statusText, _madsVm->globals()->getVocab(action));
+	statusText[0] = toupper(statusText[0]);	// capitalize first letter
+
+	if (objectId != -1) {
+		MadsObject *obj = _madsVm->globals()->getObject(objectId);
+		sprintf(statusText + strlen(statusText), " %s", _madsVm->globals()->getVocab(obj->descId));
+	} else {
+		_currentAction = action;
+	}
+*/
+	setStatusText(statusText);
+}
+
+void MadsScene::setStatusText(const char *text) {
+	strcpy(_statusText, text);
+}
+
+/**
+ * Draws all the elements of the scene
+ */
+void MadsScene::drawElements() {
+	
+	// Display animations
+	for (int idx = 0; idx < _spriteSlotsStart; ++idx) {
+		
+	}
+
+
+	// Text display 
+	_textDisplay.draw(this);
+
+	// Copy the user interface surface onto the surface
+	_interfaceSurface->copyTo(this, 0, this->height() - _interfaceSurface->height());
+
+/*
+	// At this point, in the original engine, the dirty/changed areas were copied to the screen. At the moment,
+	// the current M4 engine framework doesn't support dirty areas, but this is being kept in case that ever changes
+	for (int idx = 0; idx < DIRTY_AREA_SIZE; ++idx) {
+		if (_dirtyAreas[idx].active && _dirtyAreas[idx].active2 && 
+			(_dirtyAreas[idx].bounds.width() > 0) && (_dirtyAreas[idx].bounds.height() > 0)) {
+			// Copy changed area to screen
+
+		}
+	}
+*/
+
+	// Some kind of copying over of slot entries
+	for (int idx = 0, idx2 = 0; idx < _spriteSlotsStart; ++idx) {
+		if (_spriteSlots[idx].spriteId >= 0) {
+			if (idx != idx2) {
+				// Copy over the slot entry
+				_spriteSlots[idx2] = _spriteSlots[idx];
+			}
+			++idx2;
+		}
+	}
+}
+
+
+void MadsScene::update() {
+	// Copy the bare scene in
+	_backgroundSurface->copyTo(this);
+
+	// Draw all the various elements
+	drawElements();
+
+	// Handle display of any status text
+	if (_statusText[0]) {
+		// Text colors are inverted in Dragonsphere
+		if (_vm->getGameType() == GType_DragonSphere)
+			_vm->_font->setColors(_vm->_palette->BLACK, _vm->_palette->WHITE, _vm->_palette->BLACK);
+		else
+			_vm->_font->setColors(_vm->_palette->WHITE, _vm->_palette->BLACK, _vm->_palette->BLACK);
+
+		_vm->_font->setFont(FONT_MAIN_MADS);
+		_vm->_font->writeString(this, _statusText, (width() - _vm->_font->getWidth(_statusText)) / 2, 142, 0);
+	}
+
+	//***DEBUG***
+	_sceneSprites[0]->getFrame(1)->copyTo(this, 120, 90, 0);
+}
+
+int MadsScene::loadSceneSpriteSet(const char *setName) {
+	char resName[100];
+	strcpy(resName, setName);
+
+	// Append a '.SS' if it doesn't alreayd have an extension
+	if (!strchr(resName, '.'))
+		strcat(resName, ".SS");
+
+	Common::SeekableReadStream *data = _vm->res()->get(resName);
+	SpriteAsset *spriteSet = new SpriteAsset(_vm, data, data->size(), resName);
+	spriteSet->translate(_vm->_palette);
+	_vm->res()->toss(resName);
+
+	_sceneSprites.push_back(spriteSet);
+	return _sceneSprites.size() - 1;
+}
+
+void MadsScene::loadPlayerSprites(const char *prefix) {
+	const char suffixList[8] = { '8', '9', '6', '3', '2', '7', '4', '1' };
+	char setName[80];
+
+	strcpy(setName, "*");
+	strcat(setName, prefix);
+	strcat(setName, "_0.SS");
+	char *digitP = strchr(setName, '_') + 1;
+
+	for (int idx = 0; idx < 8; ++idx) {
+		*digitP = suffixList[idx];
+
+		if (_vm->res()->resourceExists(setName)) {
+			loadSceneSpriteSet(setName);
+			return;
+		}
+	}
+
+	error("Couldn't find player sprites");
+}
+
+/*--------------------------------------------------------------------------*/
+
+MadsAction::MadsAction() {
+	clear();
+}
+
+void MadsAction::clear() {
+	_actionMode = ACTMODE_NONE;
+	_articleNumber = 0;
+	_lookFlag = false;
+	_statusText[0] = '\0';
+	_selectedRow = -1;
+	_currentHotspot = -1;
+	//word_86F3A/word_86F4C
+	_currentAction = kVerbNone;
+	_objectNameId = -1;
+	_objectDescId = -1;
+	//word_83334
+}
+
+void MadsAction::appendVocab(int vocabId, bool capitalise) {
+	char *s = _statusText + strlen(_statusText);
+	const char *vocabStr = _madsVm->globals()->getVocab(vocabId);
+	strcpy(s, vocabStr);
+	if (capitalise)
+		*s = toupper(*s);
+
+	strcat(s, " ");
+}
+
+void MadsAction::set() {
+	bool flag = false;
+	_currentAction = -1;
+	_objectNameId = -1;
+	_objectDescId = -1;
+
+	if (_actionMode == ACTMODE_TALK) {
+		// Handle showing the conversation selection. Rex at least doesn't actually seem to use this
+		if (_selectedRow >= 0) {
+			const char *desc = _madsVm->_converse[_selectedRow].desc;
+			if (desc)
+				strcpy(_statusText, desc);
+		}
+	} else if (_lookFlag && (_selectedRow == 0)) {
+		// Two 'look' actions in succession, so the action becomes 'Look around'
+		strcpy(_statusText, lookAroundStr);
+	} else {
+		if ((_actionMode == ACTMODE_OBJECT) && (_selectedRow >= 0) && (_flags1 == 2) && (_flags2 == 0)) {
+			// Use/to action
+			int selectedObject = _madsVm->scene()->getInterface()->getSelectedObject();
+			MadsObject *objEntry = _madsVm->globals()->getObject(selectedObject);
+			
+			_objectNameId = objEntry->descId;
+			_currentAction = objEntry->vocabList[_selectedRow].vocabId;
+
+			// Set up the status text stirng
+			strcpy(_statusText, useStr);
+			appendVocab(_objectNameId);
+			strcpy(_statusText, toStr);
+			appendVocab(_currentAction);
+		} else {
+			// Handling for if an action has been selected
+			if (_selectedRow >= 0) {
+				if (_actionMode == ACTMODE_VERB) {
+					// Standard verb action
+					_currentAction = verbList[_selectedRow].verb;
+				} else {
+					// Selected action on an inventory object
+					int selectedObject = _madsVm->scene()->getInterface()->getSelectedObject();
+					MadsObject *objEntry = _madsVm->globals()->getObject(selectedObject);
+
+					_currentAction = objEntry->vocabList[_selectedRow].vocabId;
+				}
+
+				appendVocab(_currentAction, true);
+
+				if (_currentAction == kVerbLook) {
+					// Add in the word 'add'
+					strcat(_statusText, atStr);
+					strcat(_statusText, " ");
+				}
+			}
+
+			// Handling for if a hotspot has been selected/highlighted
+			if ((_currentHotspot >= 0) && (_selectedRow >= 0) && (_articleNumber > 0) && (_flags1 == 2)) {
+				flag = true;
+
+				strcat(_statusText, englishMADSArticleList[_articleNumber]);
+				strcat(_statusText, " ");
+			}
+
+			if (_currentHotspot >= 0) {
+				if (_selectedRow < 0) {
+					
+				}
+
+				//loc_21CE2
+			}
+		}
+	}
+
+	//word_83334 = -1;
+}
+
+/*--------------------------------------------------------------------------*/
+
+void MadsSceneInfo::load(int sId) {
+	const char *sceneInfoStr = MADSResourceManager::getResourceName(RESPREFIX_RM, sId, ".DAT");
+	Common::SeekableReadStream *rawStream = _vm->_resourceManager->get(sceneInfoStr);
+	MadsPack sceneInfo(rawStream);
+
+	// Basic scene info
+	Common::SeekableReadStream *stream = sceneInfo.getItemStream(0);
+
+	int resSceneId = stream->readUint16LE();
+	assert(resSceneId == sId);
+
+	artFileNum = stream->readUint16LE();
+	field_4 = stream->readUint16LE();
+	width = stream->readUint16LE();
+	height = stream->readUint16LE();
+	assert((width == 320) && (height == 156));
+	
+	stream->skip(24);
+
+	objectCount = stream->readUint16LE();
+
+	stream->skip(40);
+
+	for (int i = 0; i < objectCount; ++i) {
+		objects[i].load(stream);
+	}
+
+	// For Rex Nebular, read in the scene's compressed walk surface information
+	if (_vm->getGameType() == GType_RexNebular) {
+		delete walkData;
+
+		stream = sceneInfo.getItemStream(1);
+		walkData = (byte *)malloc(stream->size());
+		stream->read(walkData, stream->size());
+	}
+
+	_vm->_resourceManager->toss(sceneInfoStr);
+}
+
+/*--------------------------------------------------------------------------*/
+
+MadsScreenText::MadsScreenText() {
+	for (int i = 0; i < TEXT_DISPLAY_SIZE; ++i)
+		_textDisplay[i].active = false;
+	for (int i = 0; i < TIMED_TEXT_SIZE; ++i)
+		_timedText[i].flags = 0;
+	_abortTimedText = false;
+}
+
+/**
+ * Adds the specified string to the list of on-screen display text
+ */
+int MadsScreenText::add(const Common::Point &destPos, uint fontColours, int widthAdjust, const char *msg, Font *font) {
+	// Find a free slot
+	int idx = 0;
+	while ((idx < TEXT_DISPLAY_SIZE) && _textDisplay[idx].active)
+		++idx;
+	if (idx == TEXT_DISPLAY_SIZE)
+		error("Ran out of text display slots");
+
+	// Set up the entry values
+	_textDisplay[idx].active = true;
+	_textDisplay[idx].active2 = 1;
+	_textDisplay[idx].bounds.left = destPos.x;
+	_textDisplay[idx].bounds.top = destPos.y;
+	_textDisplay[idx].bounds.setWidth(font->getWidth(msg, widthAdjust));
+	_textDisplay[idx].bounds.setHeight(font->getHeight());
+	_textDisplay[idx].font = font;
+	strncpy(_textDisplay[idx].message, msg, 100);
+	_textDisplay[idx].message[99] = '\0';
+	_textDisplay[idx].colour1 = fontColours & 0xff;
+	_textDisplay[idx].colour2 = fontColours >> 8;
+	_textDisplay[idx].spacing = widthAdjust;
+
+	return idx;
+}
+
+/**
+ * Adds a new entry to the timed on-screen text display list
+ */
+int MadsScreenText::addTimed(const Common::Point &destPos, uint fontColours, uint flags, int vUnknown, uint32 timeout, const char *message) {
+	// Find a free slot
+	int idx = 0;
+	while ((idx < TIMED_TEXT_SIZE) && ((_timedText[idx].flags & TEXTFLAG_ACTIVE) != 0))
+		++idx;
+	if (idx == TIMED_TEXT_SIZE) {
+		if (vUnknown == 0)
+			return -1;
+
+		error("Ran out of timed text display slots");
+	}
+
+	// Set up the entry values
+	_timedText[idx].flags = flags | TEXTFLAG_ACTIVE;
+	strcpy(_timedText[idx].message, message);
+	_timedText[idx].colour1 = fontColours & 0xff;
+	_timedText[idx].colour2 = fontColours >> 8;
+	_timedText[idx].position.x = destPos.x;
+	_timedText[idx].position.y = destPos.y;
+	_timedText[idx].textDisplayIndex = -1;
+	_timedText[idx].timeout = timeout;
+	_timedText[idx].frameTimer = g_system->getMillis();
+	_timedText[idx].field_1C = vUnknown;
+	_timedText[idx].field_1D = 0; /* word_84206 */
+
+	// Copy the current action noun list
+	for (int i = 0; i < 3; ++i)
+		_timedText[idx].actionNouns[i] = _madsVm->scene()->actionNouns[i];
+
+	if (flags & TEXTFLAG_2) {
+		warning("word_844b8 and dword_845a0 not yet implemented");
+	}
+
+	return idx;
+}
+
+/**
+ * Draws any text display entries to the screen
+ */
+void MadsScreenText::draw(M4Surface *surface) {
+	for (int idx = 0; idx < TEXT_DISPLAY_SIZE; ++idx) {
+		if (_textDisplay[idx].active && (_textDisplay[idx].active2 >= 0)) {
+			_textDisplay[idx].font->setColours(_textDisplay[idx].colour1, 0xFF,
+				(_textDisplay[idx].colour2 == 0) ? _textDisplay[idx].colour1 : _textDisplay[idx].colour2);
+			_textDisplay[idx].font->writeString(surface, _textDisplay[idx].message, 
+				_textDisplay[idx].bounds.left, _textDisplay[idx].bounds.top, _textDisplay[idx].bounds.width(),
+				_textDisplay[idx].spacing);
+		}
+	}
+
+	// Clear up any now inactive text display entries
+	for (int idx = 0; idx < TEXT_DISPLAY_SIZE; ++idx) {
+		if (_textDisplay[idx].active2 < 0) {
+			_textDisplay[idx].active = false;
+			_textDisplay[idx].active2 = 0;
+		}
+	}
+}
+
+void MadsScreenText::timedDisplay() {
+	for (int idx = 0; !_abortTimedText && (idx < TEXT_DISPLAY_SIZE); ++idx) {
+		if (((_timedText[idx].flags & TEXTFLAG_ACTIVE) != 0) && 
+			(_timedText[idx].frameTimer <= g_system->getMillis()))
+			// Add the specified entry
+			addTimedText(&_timedText[idx]);
+	}
+}
+
+void MadsScreenText::addTimedText(TimedText *entry) {
+	if ((entry->flags & TEXTFLAG_40) != 0) {
+		this->setActive2(entry->textDisplayIndex);
+		entry->flags &= 0x7F;
+		return;
+	}
+
+	if ((entry->flags & TEXTFLAG_8) == 0) 
+		// FIXME: Adjust timeouts for ScumVM's milli counter
+		entry->timeout -= 3;
+
+	if ((entry->flags & TEXTFLAG_4) != 0) {
+		Text4A &rec = _text4A[entry->unk4AIndex];
+		if ((rec.field25 != 0) || (rec.active == 0))
+			entry->timeout = 0;
+	}
+
+	if ((entry->timeout == 0) && !_abortTimedText) {
+		entry->flags |= TEXTFLAG_40;
+
+		if (entry->field_1C) {
+			_abortTimedText = entry->field_1C;
+			//word_84208 = entry->field_1D;
+			
+			if (entry->field_1D != 1) {
+				// Restore the action list
+				for (int i = 0; i < 3; ++i)
+					_madsVm->scene()->actionNouns[i] = entry->actionNouns[i]; 
+			}
+		}
+	}
+
+	// TODO: code from 'loc_244ec' onwards
+}
+
+} // End of namespace M4


Property changes on: scummvm/trunk/engines/m4/mads_scene.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	                        (rev 0)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-03-07 05:06:58 UTC (rev 48172)
@@ -0,0 +1,199 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef M4_MADS_SCENE_H
+#define M4_MADS_SCENE_H
+
+#include "m4/scene.h"
+
+namespace M4 {
+
+#define INTERFACE_HEIGHT 106
+#define MADS_SURFACE_HEIGHT 156
+
+struct SpriteSlot {
+	int16 spriteId;
+	int16 scale;
+	uint16 spriteListIndex;
+};
+
+struct DirtyArea {
+	bool active;
+	bool active2;
+	Common::Rect bounds;
+};
+
+class MadsSceneInfo {
+public:
+	int sceneId;
+	int artFileNum;
+	int field_4;
+	int width;
+	int height;
+
+	int objectCount;
+	MadsObject objects[32];
+	
+	int walkSize;
+	byte *walkData;
+
+	MadsSceneInfo() { walkSize = 0; walkData = NULL; }
+	~MadsSceneInfo() { delete walkData; }
+	void load(int sceneId);	
+};
+
+#define TIMED_TEXT_SIZE 10
+#define TEXT_DISPLAY_SIZE 40
+#define TEXT_4A_SIZE 30
+
+enum TalkTextFlags {TEXTFLAG_2 = 2, TEXTFLAG_4 = 4, TEXTFLAG_8 = 8, TEXTFLAG_40 = 0x40,
+		TEXTFLAG_ACTIVE = 0x80};
+
+struct TextDisplay {
+	bool active;
+	int spacing;
+	int16 active2;
+	Common::Rect bounds;
+	int colour1, colour2;
+	Font *font;
+	char message[100];
+};
+
+struct TimedText {
+	uint8 flags;
+	int colour1;
+	int colour2;
+	Common::Point position;
+	int textDisplayIndex;
+	int unk4AIndex;
+	uint32 timeout;
+	uint32 frameTimer;
+	bool field_1C;
+	uint8 field_1D;
+	uint16 actionNouns[3];
+	char message[100];
+};
+
+struct Text4A {
+	uint8 active;
+	uint8 field25;
+};
+
+class MadsScreenText {
+private:
+	TextDisplay _textDisplay[TEXT_DISPLAY_SIZE];
+	TimedText _timedText[TIMED_TEXT_SIZE];
+	Text4A _text4A[TEXT_4A_SIZE];
+	bool _abortTimedText;
+
+	void addTimedText(TimedText *entry);
+public:
+	MadsScreenText();
+
+	// TextDisplay list
+	int add(const Common::Point &destPos, uint fontColours, int widthAdjust, const char *msg, Font *font);
+	void setActive2(int16 idx) { _textDisplay[idx].active2 = -1; }
+	// TimedText list
+	int addTimed(const Common::Point &destPos, uint fontColours, uint flags, int vUnknown, uint32 timeout, const char *message);
+
+	void draw(M4Surface *surface);
+	void timedDisplay();
+};
+
+enum MadsActionMode {ACTMODE_NONE = 0, ACTMODE_VERB = 1, ACTMODE_OBJECT = 3, ACTMODE_TALK = 6};
+
+class MadsAction {
+private:
+	char _statusText[100];
+	int _currentHotspot;
+	int _objectNameId;
+	int _objectDescId;
+	int _currentAction;
+	int8 _flags1, _flags2;
+	MadsActionMode _actionMode;
+	int _articleNumber;
+	bool _lookFlag;
+	int _selectedRow;
+
+	void appendVocab(int vocabId, bool capitalise = false);
+public:
+	MadsAction();
+
+	void clear();
+	void set();
+};
+
+typedef Common::Array<SpriteAsset *> SpriteAssetArray;
+
+#define SPRITE_SLOTS_SIZE 50
+#define DIRTY_AREA_SIZE 90
+
+class MadsScene : public Scene {
+private:
+	MadsEngine *_vm;
+	char _statusText[100];
+
+	MadsSceneLogic _sceneLogic;
+	MadsSceneInfo _sceneInfo;
+	SpriteAsset *_playerSprites;
+	SpriteAssetArray _sceneSprites;
+	SpriteSlot _spriteSlots[50];
+	MadsScreenText _textDisplay;
+	DirtyArea _dirtyAreas[DIRTY_AREA_SIZE];
+	int _spriteSlotsStart;
+
+	void drawElements();
+	void loadScene2(const char *aaName);
+	void loadSceneTemporary();
+	void clearAction();
+	void appendActionVocab(int vocabId, bool capitalise);
+	void setAction();
+public:
+	char _aaName[100];
+	uint16 actionNouns[3];
+public:
+	MadsScene(MadsEngine *vm);
+
+	// Methods that differ between engines
+	virtual void loadScene(int sceneNumber);
+	virtual void leaveScene();
+	virtual void loadSceneCodes(int sceneNumber, int index = 0);
+	virtual void show();
+	virtual void checkHotspotAtMousePos(int x, int y);
+	virtual void leftClick(int x, int y);
+	virtual void rightClick(int x, int y);
+	virtual void setAction(int action, int objectId = -1);
+	virtual void setStatusText(const char *text);
+	virtual void update();
+
+	int loadSceneSpriteSet(const char *setName);
+	void loadPlayerSprites(const char *prefix);
+
+	MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; };
+};
+
+} // End of namespace M4
+
+#endif


Property changes on: scummvm/trunk/engines/m4/mads_scene.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-03-06 22:40:55 UTC (rev 48171)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-03-07 05:06:58 UTC (rev 48172)
@@ -34,6 +34,8 @@
 
 namespace M4 {
 
+#define CHEAT_SEQUENCE_MAX 8
+
 class IntegerList : public Common::Array<int> {
 public:
 	int indexOf(int v) {
@@ -74,6 +76,7 @@
 	virtual void initialise();
 	virtual void setSelectedObject(int objectNumber);
 	virtual void addObjectToInventory(int objectNumber);
+	int getSelectedObject() { return _selectedObject; }
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
 	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);

Modified: scummvm/trunk/engines/m4/module.mk
===================================================================
--- scummvm/trunk/engines/m4/module.mk	2010-03-06 22:40:55 UTC (rev 48171)
+++ scummvm/trunk/engines/m4/module.mk	2010-03-07 05:06:58 UTC (rev 48172)
@@ -17,10 +17,12 @@
 	hotspot.o \
 	m4.o \
 	m4_menus.o \
+	m4_scene.o \
 	m4_views.o \
 	mads_anim.o \
 	mads_logic.o \
 	mads_menus.o \
+	mads_scene.o \
 	mads_views.o \
 	midi.o \
 	rails.o \

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-03-06 22:40:55 UTC (rev 48171)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-03-07 05:06:58 UTC (rev 48172)
@@ -406,563 +406,4 @@
 	boxSprites->getFrame(bottomRight)->copyTo(_backgroundSurface, curX, curY + 1);
 }
 
-/*--------------------------------------------------------------------------*/
-
-M4Scene::M4Scene(M4Engine *vm): Scene(vm) {
-	_vm = vm;
-	_sceneSprites = NULL;
-	_interfaceSurface = new M4InterfaceView(vm);
-}
-
-M4Scene::~M4Scene() {
-	delete _sceneSprites;
-}
-
-void M4Scene::loadSceneSprites(int sceneNumber) {
-	char filename[kM4MaxFilenameSize];
-	sprintf(filename, "%i.ssb", sceneNumber);
-
-	Common::SeekableReadStream *sceneS = _vm->res()->get(filename);
-	_sceneSprites = new SpriteAsset(_vm, sceneS, sceneS->size(), filename);
-	_vm->res()->toss(filename);
-
-	printf("Scene has %d sprites, each one having %d colors\n", _sceneSprites->getCount(), _sceneSprites->getColorCount());
-}
-
-void M4Scene::loadScene(int sceneNumber) {
-	Scene::loadScene(sceneNumber);
-
-	_backgroundSurface->loadBackground(sceneNumber);
-	_palData = NULL;
-
-	if (_vm->getGameType() == GType_Burger &&
-			sceneNumber != TITLE_SCENE_BURGER && sceneNumber != MAINMENU_SCENE_BURGER)
-		setStatusText("");
-
-	// Load scene def file (*.CHK)
-	loadSceneResources(sceneNumber);
-	loadSceneInverseColorTable(sceneNumber);
-
-	// TODO: set walker scaling
-	// TODO: destroy woodscript buffer
-
-	// Load scene walk path file (*.COD/*.WW?)
-	loadSceneCodes(sceneNumber);
-
-	// Load inverse color table file (*.IPL)
-	loadSceneInverseColorTable(sceneNumber);
-
-	if (_vm->getGameType() != GType_Burger) {
-		// Load scene sprites file (*.SSB)
-		loadSceneSprites(sceneNumber);
-
-		// Load scene sprite codes file (*.SSC)
-		loadSceneSpriteCodes(sceneNumber);
-	}
-
-
-	if (sceneNumber != TITLE_SCENE_BURGER && sceneNumber != MAINMENU_SCENE_BURGER) {
-		_m4Vm->scene()->getInterface()->show();
-		showSprites();
-	}
-
-	// Purge resources
-	_vm->res()->purge();
-}
-
-void M4Scene::loadSceneCodes(int sceneNumber, int index) {
-	char filename[kM4MaxFilenameSize];
-	Common::SeekableReadStream *sceneS;
-
-	sprintf(filename, "%i.cod", sceneNumber);
-	sceneS = _vm->res()->openFile(filename);
-	_walkSurface->loadCodesM4(sceneS);
-	_vm->res()->toss(filename);
-}
-
-void M4Scene::show() {
-	Scene::show();
-	_vm->_viewManager->addView(_interfaceSurface);
-}
-
-void M4Scene::checkHotspotAtMousePos(int x, int y) {
-	if (_vm->getGameType() == GType_Riddle)
-		return;
-
-	// TODO: loads of things to do here, only the mouse cursor and the status
-	// text is changed for now
-
-	// Only scene hotspots are checked for now, not parallax/props, as the
-	// latter ones are not used by Orion Burger
-	HotSpot *currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
-	if (currentHotSpot != NULL && currentHotSpot->getActive()) {
-		if (_vm->_mouse->getCursorNum() != CURSOR_LOOK &&
-			_vm->_mouse->getCursorNum() != CURSOR_TAKE &&
-			_vm->_mouse->getCursorNum() != CURSOR_USE &&
-			_m4Vm->scene()->getInterface()->_inventory.getSelectedIndex() == -1) {
-			_vm->_mouse->setCursorNum(currentHotSpot->getCursor());
-		}
-		_m4Vm->scene()->getInterface()->setStatusText(currentHotSpot->getPrep());
-	} else {
-		if (_vm->_mouse->getCursorNum() != CURSOR_LOOK &&
-			_vm->_mouse->getCursorNum() != CURSOR_TAKE &&
-			_vm->_mouse->getCursorNum() != CURSOR_USE &&
-			_m4Vm->scene()->getInterface()->_inventory.getSelectedIndex() == -1) {
-			_vm->_mouse->setCursorNum(0);
-		} else {
-
-		}
-	}
-}
-
-void M4Scene::leftClick(int x, int y) {
-	if (_vm->getGameType() == GType_Burger) {
-		// Place a Wilbur sprite with the correct facing
-		HotSpot	*currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
-		if (currentHotSpot != NULL && currentHotSpot->getActive()) {
-			update();
-			_vm->_actor->setWalkerDirection(currentHotSpot->getFacing());
-			/*
-			int posX = currentHotSpot->getFeetX();
-			int posY = currentHotSpot->getFeetY() -
-					   scaleValue(_vm->_actor->getWalkerHeight(), _vm->_actor->getWalkerScaling(), 0);
-			//_vm->_actor->placeWalkerSpriteAt(0, posX, posY);
-			*/
-
-			// Player said.... (for scene scripts)
-			printf("Player said: %s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab());
-
-			// FIXME: This should be moved somewhere else, and is incomplete
-			if (_m4Vm->scene()->getInterface()->_inventory.getSelectedIndex() == -1) {
-				if (_vm->_mouse->getVerb() == NULL) {
-					strcpy(_vm->_player->verb, currentHotSpot->getVerb());
-				} else {
-					strcpy(_vm->_player->verb, _vm->_mouse->getVerb());
-				}
-			} else {
-				strcpy(_vm->_player->verb, _m4Vm->scene()->getInterface()->_inventory.getSelectedObjectName());
-			}
-			strcpy(_vm->_player->noun, currentHotSpot->getVocab());
-			strcpy(_vm->_player->object, "");
-			_vm->_player->commandReady = true;
-
-			printf("## Player said: %s %s\n", _vm->_player->verb, _vm->_player->noun);
-
-		}
-	}
-}
-
-void M4Scene::rightClick(int x, int y) {
-	if (_vm->getGameType() == GType_Burger) {
-		nextCommonCursor();
-		_m4Vm->scene()->getInterface()->_inventory.clearSelected();
-	}
-}
-
-void M4Scene::setAction(int action, int objectId) {
-}
-
-void M4Scene::setStatusText(const char *text) {
-	getInterface()->setStatusText(text);
-}
-
-void M4Scene::update() {
-
-}
-
-void M4Scene::nextCommonCursor() {
-	int cursorIndex = _vm->_mouse->getCursorNum();
-
-	switch (cursorIndex) {
-	case CURSOR_ARROW:
-		cursorIndex = CURSOR_LOOK;
-		break;
-	case CURSOR_LOOK:
-		cursorIndex = CURSOR_TAKE;
-		break;
-	case CURSOR_TAKE:
-		cursorIndex = CURSOR_USE;
-		break;
-	case CURSOR_USE:
-		cursorIndex = CURSOR_ARROW;
-		break;
-	default:
-		cursorIndex = CURSOR_ARROW;
-	}
-
-	_vm->_mouse->setCursorNum(cursorIndex);
-}
-
-/*--------------------------------------------------------------------------*/
-
-MadsScene::MadsScene(MadsEngine *vm): Scene(vm) {
-	_vm = vm;
-
-	strcpy(_statusText, "");
-	_interfaceSurface = new MadsInterfaceView(vm);
-	_currentAction = kVerbNone;
-	_spriteSlotsStart = 0;
-}
-
-/**
- * Secondary scene loading code
- */
-void MadsScene::loadScene2(const char *aaName) {
-	// Load up the properties for the scene
-	_sceneInfo.load(_currentScene);
-
-	// Load scene walk paths
-	loadSceneCodes(_currentScene);
-}
-
-/**
- * Existing ScummVM code that needs to be eventually replaced with MADS code
- */
-void MadsScene::loadSceneTemporary() {
-	/* Existing code that eventually needs to be replaced with the proper MADS code */
-	// Set system palette entries
-	_vm->_palette->blockRange(0, 7);
-	RGB8 sysColors[3] = { {0x1f<<2, 0x2d<<2, 0x31<<2, 0}, {0x24<<2, 0x37<<2, 0x3a<<2, 0},
-		{0x00<<2, 0x10<<2, 0x16<<2, 0}};
-	_vm->_palette->setPalette(&sysColors[0], 4, 3);
-
-	_backgroundSurface->loadBackground(_currentScene, &_palData);
-	_vm->_palette->addRange(_palData);
-	_backgroundSurface->translate(_palData);
-
-	if (_currentScene < 900) {
-		/*_backgroundSurface->fillRect(Common::Rect(0, MADS_SURFACE_HEIGHT,
-			_backgroundSurface->width(), _backgroundSurface->height()),
-			_vm->_palette->BLACK);*/
-		// TODO: interface palette
-		_interfaceSurface->madsloadInterface(0, &_interfacePal);
-		_vm->_palette->addRange(_interfacePal);
-		_interfaceSurface->translate(_interfacePal);
-		_backgroundSurface->copyFrom(_interfaceSurface, Common::Rect(0, 0, 320, 44), 0, 200 - 44);
-
-		_interfaceSurface->initialise();
-	}
-
-	// Don't load other screen resources for system screens
-	if (_currentScene >= 900)
-		return;
-
-	loadSceneHotSpotsMads(_currentScene);
-
-	// TODO: set walker scaling
-	// TODO: destroy woodscript buffer
-
-	// Load inverse color table file (*.IPL)
-	loadSceneInverseColorTable(_currentScene);
-}
-
-void MadsScene::loadScene(int sceneNumber) {
-	// Close the menu if it's active
-	View *mainMenu = _vm->_viewManager->getView(VIEWID_MAINMENU);
-	if (mainMenu != NULL) {
-		_vm->_viewManager->deleteView(mainMenu);
-	}
-
-	// Handle common scene setting
-	Scene::loadScene(sceneNumber);
-
-	// Signal the script engine what scene is to be active
-	_sceneLogic.selectScene(sceneNumber);
-	_sceneLogic.setupScene();
-
-	// Add the scene if necessary to the list of scenes that have been visited
-	_vm->globals()->addVisitedScene(sceneNumber);
-
-	// Secondary scene load routine
-	loadScene2("*I0.AA");
-
-	// Do any scene specific setup
-	_sceneLogic.enterScene();
-
-	// Existing ScummVM code that needs to be eventually replaced with MADS code
-	loadSceneTemporary();
-
-	// Purge resources
-	_vm->res()->purge();
-}
-
-void MadsScene::leaveScene() {
-	_sceneResources.hotspots->clear();
-	_sceneResources.parallax->clear();
-	_sceneResources.props->clear();
-
-	delete _sceneResources.hotspots;
-	delete _sceneResources.parallax;
-	delete _sceneResources.props;
-
-	// Delete the sprites
-	for (uint i = 0; i <_sceneSprites.size(); ++i) delete _sceneSprites[i];
-	_sceneSprites.clear();
-
-	delete _backgroundSurface;
-	delete _walkSurface;
-
-	Scene::leaveScene();
-}
-
-void MadsScene::show() {
-	Scene::show();
-	_vm->_viewManager->addView(_interfaceSurface);
-}
-
-void MadsScene::loadSceneCodes(int sceneNumber, int index) {
-	char filename[kM4MaxFilenameSize];
-	Common::SeekableReadStream *sceneS;
-
-	if (_vm->getGameType() == GType_Phantom || _vm->getGameType() == GType_DragonSphere) {
-		sprintf(filename, "rm%i.ww%i", sceneNumber, index);
-		MadsPack walkData(filename, _vm);
-		sceneS = walkData.getItemStream(0);
-		_walkSurface->loadCodesMads(sceneS);
-		_vm->res()->toss(filename);
-	} else if (_vm->getGameType() == GType_RexNebular) {
-		// For Rex Nebular, the walk areas are part of the scene info
-		byte *destP = _walkSurface->getBasePtr(0, 0);
-		const byte *srcP = _sceneInfo.walkData;
-		byte runLength;
-		while ((runLength = *srcP++) != 0) {
-			Common::set_to(destP, destP + runLength, *srcP++);
-			destP += runLength;
-		}
-	}
-}
-
-void MadsScene::checkHotspotAtMousePos(int x, int y) {
-	HotSpot *currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
-	if (currentHotSpot != NULL) {
-		_vm->_mouse->setCursorNum(currentHotSpot->getCursor());
-
-		// This is the "easy" interface, which updates the status text when the mouse is moved
-		// TODO: toggle this code for easy/normal interface mode
-		char statusText[50];
-		int verbId = _currentAction;
-		if (verbId == kVerbNone)
-			verbId = currentHotSpot->getVerbID();
-		if (verbId == kVerbNone)
-			verbId = kVerbWalkTo;
-
-		sprintf(statusText, "%s %s\n", _madsVm->globals()->getVocab(verbId), currentHotSpot->getVocab());
-
-		statusText[0] = toupper(statusText[0]);	// capitalize first letter
-		setStatusText(statusText);
-	} else {
-		_vm->_mouse->setCursorNum(0);
-		setStatusText("");
-	}
-}
-
-void MadsScene::leftClick(int x, int y) {
-	HotSpot *currentHotSpot = _sceneResources.hotspots->findByXY(x, y);
-	if (currentHotSpot != NULL) {
-		char statusText[50];
-		if (currentHotSpot->getVerbID() != 0) {
-			sprintf(statusText, "%s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab());
-		} else {
-			sprintf(statusText, "%s %s\n", _madsVm->globals()->getVocab(kVerbWalkTo), currentHotSpot->getVocab());
-		}
-
-		statusText[0] = toupper(statusText[0]);	// capitalize first letter
-		setStatusText(statusText);
-	}
-}
-
-void MadsScene::rightClick(int x, int y) {
-	// ***DEBUG*** - sample dialog display
-	int idx = 3; //_madsVm->_globals->messageIndexOf(0x277a);
-	const char *msg = _madsVm->globals()->loadMessage(idx);
-	Dialog *dlg = new Dialog(_vm, msg, "TEST DIALOG");
-	_vm->_viewManager->addView(dlg);
-	_vm->_viewManager->moveToFront(dlg);
-}
-
-void MadsScene::setAction(int action, int objectId) {
-	VALIDATE_MADS;
-	char statusText[50];
-
-	// TODO: Actually executing actions directly for objects. Also, some object actions are special in that
-	// a second object can be selected, as in 'use gun to shoot person', with requires a target
-
-	// Set up the new action
-	strcpy(statusText, _madsVm->globals()->getVocab(action));
-	statusText[0] = toupper(statusText[0]);	// capitalize first letter
-
-	if (objectId != -1) {
-		MadsObject *obj = _madsVm->globals()->getObject(objectId);
-		sprintf(statusText + strlen(statusText), " %s", _madsVm->globals()->getVocab(obj->descId));
-	} else {
-		_currentAction = action;
-	}
-
-	setStatusText(statusText);
-}
-
-void MadsScene::setStatusText(const char *text) {
-	strcpy(_statusText, text);
-}
-
-/**
- * Draws all the elements of the scene
- */
-void MadsScene::drawElements() {
-	
-	// Display animations
-	for (int idx = 0; idx < _spriteSlotsStart; ++idx) {
-		
-	}
-
-
-	// Text display loop
-	for (int idx = 0; idx < TEXT_DISPLAY_SIZE; ++idx) {
-		if (_textDisplay[idx].active && (_textDisplay[idx].field_A >= 0)) {
-			_textDisplay[idx].font->setColours(0xFF, (_textDisplay[idx].colour2 == 0) ? 
-				_textDisplay[idx].colour1 : _textDisplay[idx].colour2, _textDisplay[idx].colour1);
-			_textDisplay[idx].font->writeString(this, _textDisplay[idx].message, 
-				_textDisplay[idx].bounds.left, _textDisplay[idx].bounds.top, 
-				width() - _textDisplay[idx].bounds.left, _textDisplay[idx].spacing);
-		}
-	}
-
-	// Copy the user interface surface onto the surface
-	_interfaceSurface->copyTo(this, 0, this->height() - _interfaceSurface->height());
-
-/*
-	// At this point, in the original engine, the dirty/changed areas were copied to the screen. At the moment,
-	// the current M4 engine framework doesn't support dirty areas, but this is being kept in case that ever changes
-	for (int idx = 0; idx < DIRTY_AREA_SIZE; ++idx) {
-		if (_dirtyAreas[idx].active && _dirtyAreas[idx].active2 && 
-			(_dirtyAreas[idx].bounds.width() > 0) && (_dirtyAreas[idx].bounds.height() > 0)) {
-			// Copy changed area to screen
-
-		}
-	}
-*/
-
-	// Some kind of copying over of slot entries
-	for (int idx = 0, idx2 = 0; idx < _spriteSlotsStart; ++idx) {
-		if (_spriteSlots[idx].spriteId >= 0) {
-			if (idx != idx2) {
-				// Copy over the slot entry
-				_spriteSlots[idx2] = _spriteSlots[idx];
-			}
-			++idx2;
-		}
-	}
-
-	// Clear up any now inactive text display entries
-	for (int idx = 0; idx < TEXT_DISPLAY_SIZE; ++idx) {
-		if (_textDisplay[idx].field_A < 0) {
-			_textDisplay[idx].active = false;
-			_textDisplay[idx].field_A = 0;
-		}
-	}
-}
-
-
-void MadsScene::update() {
-	// Copy the bare scene in
-	_backgroundSurface->copyTo(this);
-
-	// Draw all the various elements
-	drawElements();
-
-	// Handle display of any status text
-	if (_statusText[0]) {
-		// Text colors are inverted in Dragonsphere
-		if (_vm->getGameType() == GType_DragonSphere)
-			_vm->_font->setColors(_vm->_palette->BLACK, _vm->_palette->WHITE, _vm->_palette->BLACK);
-		else
-			_vm->_font->setColors(_vm->_palette->WHITE, _vm->_palette->BLACK, _vm->_palette->BLACK);
-
-		_vm->_font->setFont(FONT_MAIN_MADS);
-		_vm->_font->writeString(this, _statusText, (width() - _vm->_font->getWidth(_statusText)) / 2, 142, 0);
-	}
-
-	//***DEBUG***
-	_sceneSprites[0]->getFrame(1)->copyTo(this, 120, 90, 0);
-}
-
-int MadsScene::loadSceneSpriteSet(const char *setName) {
-	char resName[100];
-	strcpy(resName, setName);
-
-	// Append a '.SS' if it doesn't alreayd have an extension
-	if (!strchr(resName, '.'))
-		strcat(resName, ".SS");
-
-	Common::SeekableReadStream *data = _vm->res()->get(resName);
-	SpriteAsset *spriteSet = new SpriteAsset(_vm, data, data->size(), resName);
-	spriteSet->translate(_vm->_palette);
-	_vm->res()->toss(resName);
-
-	_sceneSprites.push_back(spriteSet);
-	return _sceneSprites.size() - 1;
-}
-
-void MadsScene::loadPlayerSprites(const char *prefix) {
-	const char suffixList[8] = { '8', '9', '6', '3', '2', '7', '4', '1' };
-	char setName[80];
-
-	strcpy(setName, "*");
-	strcat(setName, prefix);
-	strcat(setName, "_0.SS");
-	char *digitP = strchr(setName, '_') + 1;
-
-	for (int idx = 0; idx < 8; ++idx) {
-		*digitP = suffixList[idx];
-
-		if (_vm->res()->resourceExists(setName)) {
-			loadSceneSpriteSet(setName);
-			return;
-		}
-	}
-
-	error("Couldn't find player sprites");
-}
-
-/*--------------------------------------------------------------------------*/
-
-void MadsSceneInfo::load(int sId) {
-	const char *sceneInfoStr = MADSResourceManager::getResourceName(RESPREFIX_RM, sId, ".DAT");
-	Common::SeekableReadStream *rawStream = _vm->_resourceManager->get(sceneInfoStr);
-	MadsPack sceneInfo(rawStream);
-
-	// Basic scene info
-	Common::SeekableReadStream *stream = sceneInfo.getItemStream(0);
-
-	int resSceneId = stream->readUint16LE();
-	assert(resSceneId == sId);
-
-	artFileNum = stream->readUint16LE();
-	field_4 = stream->readUint16LE();
-	width = stream->readUint16LE();
-	height = stream->readUint16LE();
-	assert((width == 320) && (height == 156));
-	
-	stream->skip(24);
-
-	objectCount = stream->readUint16LE();
-
-	stream->skip(40);
-
-	for (int i = 0; i < objectCount; ++i) {
-		objects[i].load(stream);
-	}
-
-	// For Rex Nebular, read in the scene's compressed walk surface information
-	if (_vm->getGameType() == GType_RexNebular) {
-		delete walkData;
-
-		stream = sceneInfo.getItemStream(1);
-		walkData = (byte *)malloc(stream->size());
-		stream->read(walkData, stream->size());
-	}
-
-	_vm->_resourceManager->toss(sceneInfoStr);
-}
-
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-03-06 22:40:55 UTC (rev 48171)
+++ scummvm/trunk/engines/m4/scene.h	2010-03-07 05:06:58 UTC (rev 48172)
@@ -41,16 +41,8 @@
 
 namespace M4 {
 
-#define TITLE_SCENE_BURGER 951		// 951 = intro, 901 = demo menu, 971 = first scene
-#define MAINMENU_SCENE_BURGER 903
-#define FIRST_SCENE 101
 #define MAX_CHK_FILENAME_SIZE 144
 
-#define INTERFACE_HEIGHT 106
-#define MADS_SURFACE_HEIGHT 156
-
-#define CHEAT_SEQUENCE_MAX 8
-
 enum MADSVerbs {
 	kVerbNone   = 0,
 	kVerbLook	= 3,
@@ -136,121 +128,6 @@
 	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
 };
 
-class M4Scene : public Scene {
-private:
-	M4Engine *_vm;
-	SpriteAsset *_sceneSprites;
-	SpriteAsset *_walkerSprite;
-
-	void loadSceneSprites(int sceneNumber);
-	void nextCommonCursor();
-public:
-	M4Scene(M4Engine *vm);
-	virtual ~M4Scene();
-
-	// Methods that differ between engines
-	virtual void loadScene(int sceneNumber);
-	virtual void leaveScene() {};
-	virtual void loadSceneCodes(int sceneNumber, int index = 0);
-	virtual void show();
-	virtual void checkHotspotAtMousePos(int x, int y);
-	virtual void leftClick(int x, int y);
-	virtual void rightClick(int x, int y);
-	virtual void setAction(int action, int objectId = -1);
-	virtual void setStatusText(const char *text);
-	virtual void update();
-
-	M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; };
-};
-
-struct SpriteSlot {
-	int16 spriteId;
-	int16 scale;
-	uint16 spriteListIndex;
-};
-
-struct TextDisplay {
-	bool active;
-	int spacing;
-	Common::Rect bounds;
-	int16 field_A;
-	uint8 colour1, colour2;
-	Font *font;
-	char message[100];
-};
-
-struct DirtyArea {
-	bool active;
-	bool active2;
-	Common::Rect bounds;
-};
-
-class MadsSceneInfo {
-public:
-	int sceneId;
-	int artFileNum;
-	int field_4;
-	int width;
-	int height;
-
-	int objectCount;
-	MadsObject objects[32];
-	
-	int walkSize;
-	byte *walkData;
-
-	MadsSceneInfo() { walkSize = 0; walkData = NULL; }
-	~MadsSceneInfo() { delete walkData; }
-	void load(int sceneId);	
-};
-
-typedef Common::Array<SpriteAsset *> SpriteAssetArray;
-
-#define SPRITE_SLOTS_SIZE 50
-#define TEXT_DISPLAY_SIZE 40
-#define DIRTY_AREA_SIZE 90
-
-class MadsScene : public Scene {
-private:
-	MadsEngine *_vm;
-
-	int _currentAction;
-	char _statusText[100];
-	MadsSceneLogic _sceneLogic;
-	MadsSceneInfo _sceneInfo;
-	SpriteAsset *_playerSprites;
-	SpriteAssetArray _sceneSprites;
-	SpriteSlot _spriteSlots[50];
-	TextDisplay _textDisplay[TEXT_DISPLAY_SIZE];
-	DirtyArea _dirtyAreas[DIRTY_AREA_SIZE];
-	int _spriteSlotsStart;
-
-	void drawElements();
-	void loadScene2(const char *aaName);
-	void loadSceneTemporary();
-public:
-	char _aaName[100];
-public:
-	MadsScene(MadsEngine *vm);
-
-	// Methods that differ between engines
-	virtual void loadScene(int sceneNumber);
-	virtual void leaveScene();
-	virtual void loadSceneCodes(int sceneNumber, int index = 0);
-	virtual void show();
-	virtual void checkHotspotAtMousePos(int x, int y);
-	virtual void leftClick(int x, int y);
-	virtual void rightClick(int x, int y);
-	virtual void setAction(int action, int objectId = -1);
-	virtual void setStatusText(const char *text);
-	virtual void update();
-
-	int loadSceneSpriteSet(const char *setName);
-	void loadPlayerSprites(const char *prefix);
-
-	MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; };
-};
-
 } // End of namespace M4
 
 #endif

Modified: scummvm/trunk/engines/m4/script.cpp
===================================================================
--- scummvm/trunk/engines/m4/script.cpp	2010-03-06 22:40:55 UTC (rev 48171)
+++ scummvm/trunk/engines/m4/script.cpp	2010-03-07 05:06:58 UTC (rev 48172)
@@ -1103,7 +1103,7 @@
 	//int flag = INTEGER(2);
 
 	// TODO; just to show something
-	_vm->_converse->startConversation(name);
+	_m4Vm->_converse->startConversation(name);
 
 	return 3;
 }

Modified: scummvm/trunk/engines/m4/staticres.cpp
===================================================================
--- scummvm/trunk/engines/m4/staticres.cpp	2010-03-06 22:40:55 UTC (rev 48171)
+++ scummvm/trunk/engines/m4/staticres.cpp	2010-03-07 05:06:58 UTC (rev 48172)
@@ -37,5 +37,22 @@
 	NULL
 };
 
+const char *atStr = "at";
+const char *lookAroundStr = "Look around";
+const char *toStr = "to ";
+const char *useStr = "Use ";
 
+VerbInit verbList[10] = {
+	{kVerbLook, 2, 0},
+	{kVerbTake, 2, 0},
+	{kVerbPush, 2, 0},
+	{kVerbOpen, 2, 0},
+	{kVerbPut, 1, -1},
+	{kVerbTalkTo, 2, 0},
+	{kVerbGive, 1, 2},
+	{kVerbPull, 2, 0},
+	{kVerbClose, 2, 0},
+	{kVerbThrow, 1, 3}
+};
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/staticres.h
===================================================================
--- scummvm/trunk/engines/m4/staticres.h	2010-03-06 22:40:55 UTC (rev 48171)
+++ scummvm/trunk/engines/m4/staticres.h	2010-03-07 05:06:58 UTC (rev 48172)
@@ -35,6 +35,19 @@
 
 extern const char *cheatingEnabledDesc[3];
 
+extern const char *atStr;
+extern const char *lookAroundStr;
+extern const char *toStr;
+extern const char *useStr;
+
+struct VerbInit {
+	int verb;
+	int8 flag1;
+	int8 flag2;
+};
+
+extern VerbInit verbList[10];
+
 } // End of namespace M4
 
 #endif


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

Revision: 48223
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48223&view=rev
Author:   dreammaster
Date:     2010-03-10 11:43:48 +0000 (Wed, 10 Mar 2010)

Log Message:
-----------
Split up the SceneResources class into a generic common set, with specific versions each for M4 and Mads, and merged the MadsSceneInfo data into it

Modified Paths:
--------------
    scummvm/trunk/engines/m4/m4_scene.cpp
    scummvm/trunk/engines/m4/m4_scene.h
    scummvm/trunk/engines/m4/mads_scene.cpp
    scummvm/trunk/engines/m4/mads_scene.h
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h
    scummvm/trunk/engines/m4/staticres.cpp
    scummvm/trunk/engines/m4/staticres.h

Modified: scummvm/trunk/engines/m4/m4_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_scene.cpp	2010-03-10 11:26:27 UTC (rev 48222)
+++ scummvm/trunk/engines/m4/m4_scene.cpp	2010-03-10 11:43:48 UTC (rev 48223)
@@ -25,9 +25,9 @@
 
 #include "common/system.h"
 
+#include "m4/m4_scene.h"
 #include "m4/dialogs.h"
 #include "m4/globals.h"
-#include "m4/scene.h"
 #include "m4/events.h"
 #include "m4/graphics.h"
 #include "m4/rails.h"
@@ -38,7 +38,7 @@
 
 namespace M4 {
 
-M4Scene::M4Scene(M4Engine *vm): Scene(vm) {
+M4Scene::M4Scene(M4Engine *vm): _sceneResources(), Scene(vm, &_sceneResources) {
 	_vm = vm;
 	_sceneSprites = NULL;
 	_interfaceSurface = new M4InterfaceView(vm);

Modified: scummvm/trunk/engines/m4/m4_scene.h
===================================================================
--- scummvm/trunk/engines/m4/m4_scene.h	2010-03-10 11:26:27 UTC (rev 48222)
+++ scummvm/trunk/engines/m4/m4_scene.h	2010-03-10 11:43:48 UTC (rev 48223)
@@ -36,9 +36,18 @@
 #define MAINMENU_SCENE_BURGER 903
 #define FIRST_SCENE 101
 
+class M4SceneResources : public SceneResources {
+public:
+	int32 frontY, backY;
+	int32 frontScale, backScale;
+	int16 depthTable[16];
+	int32 railNodeCount;	// # of rails
+};
+
 class M4Scene : public Scene {
 private:
 	M4Engine *_vm;
+	M4SceneResources _sceneResources;
 	SpriteAsset *_sceneSprites;
 	SpriteAsset *_walkerSprite;
 
@@ -61,6 +70,7 @@
 	virtual void update();
 
 	M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; };
+	M4SceneResources &getSceneResources() { return _sceneResources; };
 };
 
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-03-10 11:26:27 UTC (rev 48222)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-03-10 11:43:48 UTC (rev 48223)
@@ -40,7 +40,7 @@
 
 namespace M4 {
 
-MadsScene::MadsScene(MadsEngine *vm): Scene(vm) {
+MadsScene::MadsScene(MadsEngine *vm): _sceneResources(), Scene(vm, &_sceneResources) {
 	_vm = vm;
 
 	strcpy(_statusText, "");
@@ -55,7 +55,7 @@
  */
 void MadsScene::loadScene2(const char *aaName) {
 	// Load up the properties for the scene
-	_sceneInfo.load(_currentScene);
+	_sceneResources.load(_currentScene);
 
 	// Load scene walk paths
 	loadSceneCodes(_currentScene);
@@ -169,7 +169,7 @@
 	} else if (_vm->getGameType() == GType_RexNebular) {
 		// For Rex Nebular, the walk areas are part of the scene info
 		byte *destP = _walkSurface->getBasePtr(0, 0);
-		const byte *srcP = _sceneInfo.walkData;
+		const byte *srcP = _sceneResources.walkData;
 		byte runLength;
 		while ((runLength = *srcP++) != 0) {
 			Common::set_to(destP, destP + runLength, *srcP++);
@@ -448,7 +448,26 @@
 
 			if (_currentHotspot >= 0) {
 				if (_selectedRow < 0) {
-					
+					int verbId;
+					int hotspotCount = _madsVm->scene()->getSceneResources().hotspotCount;
+
+					if (_currentHotspot < hotspotCount) {
+						// Get the verb Id from the hotspot
+						verbId = 0;//selected hotspot
+					} else {
+						// Get the verb Id from the scene object
+						verbId = 0;//Scene_object[_currentHotspot - _hotspotCount].verbId;
+					}
+
+					if (verbId > 0) {
+						// Set the specified action
+						_currentAction = verbId;
+						appendVocab(_currentAction, true);
+					} else {
+						// Default to a standard 'walk to'
+						_currentAction = kVerbWalkTo;
+						strcat(_statusText, walkToStr);
+					}
 				}
 
 				//loc_21CE2
@@ -461,7 +480,7 @@
 
 /*--------------------------------------------------------------------------*/
 
-void MadsSceneInfo::load(int sId) {
+void MadsSceneResources::load(int sId) {
 	const char *sceneInfoStr = MADSResourceManager::getResourceName(RESPREFIX_RM, sId, ".DAT");
 	Common::SeekableReadStream *rawStream = _vm->_resourceManager->get(sceneInfoStr);
 	MadsPack sceneInfo(rawStream);

Modified: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	2010-03-10 11:26:27 UTC (rev 48222)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-03-10 11:43:48 UTC (rev 48223)
@@ -45,7 +45,8 @@
 	Common::Rect bounds;
 };
 
-class MadsSceneInfo {
+
+class MadsSceneResources: public SceneResources {
 public:
 	int sceneId;
 	int artFileNum;
@@ -59,8 +60,8 @@
 	int walkSize;
 	byte *walkData;
 
-	MadsSceneInfo() { walkSize = 0; walkData = NULL; }
-	~MadsSceneInfo() { delete walkData; }
+	MadsSceneResources() { walkSize = 0; walkData = NULL; }
+	~MadsSceneResources() { delete walkData; }
 	void load(int sceneId);	
 };
 
@@ -153,10 +154,10 @@
 class MadsScene : public Scene {
 private:
 	MadsEngine *_vm;
+	MadsSceneResources _sceneResources;
 	char _statusText[100];
 
 	MadsSceneLogic _sceneLogic;
-	MadsSceneInfo _sceneInfo;
 	SpriteAsset *_playerSprites;
 	SpriteAssetArray _sceneSprites;
 	SpriteSlot _spriteSlots[50];
@@ -192,6 +193,7 @@
 	void loadPlayerSprites(const char *prefix);
 
 	MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; };
+	MadsSceneResources &getSceneResources() { return _sceneResources; };
 };
 
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-03-10 11:26:27 UTC (rev 48222)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-03-10 11:43:48 UTC (rev 48223)
@@ -39,12 +39,13 @@
 
 namespace M4 {
 
-Scene::Scene(MadsM4Engine *vm): View(vm, Common::Rect(0, 0, vm->_screen->width(), vm->_screen->height())) {
+Scene::Scene(MadsM4Engine *vm, SceneResources *res): View(vm, Common::Rect(0, 0, vm->_screen->width(), 
+			vm->_screen->height())), _sceneResources(res) {
 	_screenType = VIEWID_SCENE;
 
-	_sceneResources.hotspots = new HotSpotList();
-	_sceneResources.parallax = new HotSpotList();
-	_sceneResources.props = new HotSpotList();
+	_sceneResources->hotspots = new HotSpotList();
+	_sceneResources->parallax = new HotSpotList();
+	_sceneResources->props = new HotSpotList();
 	_backgroundSurface = new M4Surface();
 	_walkSurface = new M4Surface();
 	_palData = NULL;
@@ -100,23 +101,23 @@
 	Common::SeekableReadStream *sceneS = _vm->res()->get(filename);
 
 	if (sceneS != NULL) {
-		sceneS->read(_sceneResources.artBase, MAX_CHK_FILENAME_SIZE);
-		sceneS->read(_sceneResources.pictureBase, MAX_CHK_FILENAME_SIZE);
-		_sceneResources.hotspotCount = sceneS->readUint32LE();
-		_sceneResources.parallaxCount = sceneS->readUint32LE();
-		_sceneResources.propsCount = sceneS->readUint32LE();
-		_sceneResources.frontY = sceneS->readUint32LE();
-		_sceneResources.backY = sceneS->readUint32LE();
-		_sceneResources.frontScale = sceneS->readUint32LE();
-		_sceneResources.backScale = sceneS->readUint32LE();
+		sceneS->read(_sceneResources->artBase, MAX_CHK_FILENAME_SIZE);
+		sceneS->read(_sceneResources->pictureBase, MAX_CHK_FILENAME_SIZE);
+		_sceneResources->hotspotCount = sceneS->readUint32LE();
+		_sceneResources->parallaxCount = sceneS->readUint32LE();
+		_sceneResources->propsCount = sceneS->readUint32LE();
+		_sceneResources->frontY = sceneS->readUint32LE();
+		_sceneResources->backY = sceneS->readUint32LE();
+		_sceneResources->frontScale = sceneS->readUint32LE();
+		_sceneResources->backScale = sceneS->readUint32LE();
 		for (i = 0; i < 16; i++)
-			_sceneResources.depthTable[i] = sceneS->readUint16LE();
-		_sceneResources.railNodeCount = sceneS->readUint32LE();
+			_sceneResources->depthTable[i] = sceneS->readUint16LE();
+		_sceneResources->railNodeCount = sceneS->readUint32LE();
 
 		// Clear rails from previous scene
 		_vm->_rails->clearRails();
 
-		for (i = 0; i < _sceneResources.railNodeCount; i++) {
+		for (i = 0; i < _sceneResources->railNodeCount; i++) {
 			x = sceneS->readUint32LE();
 			y = sceneS->readUint32LE();
 			if (_vm->_rails->addRailNode(x, y, true) < 0) {
@@ -125,13 +126,13 @@
 		}
 
 		// Clear current hotspot lists
-		_sceneResources.hotspots->clear();
-		_sceneResources.parallax->clear();
-		_sceneResources.props->clear();
+		_sceneResources->hotspots->clear();
+		_sceneResources->parallax->clear();
+		_sceneResources->props->clear();
 
-		_sceneResources.hotspots->loadHotSpots(sceneS, _sceneResources.hotspotCount);
-		_sceneResources.parallax->loadHotSpots(sceneS, _sceneResources.parallaxCount);
-		_sceneResources.props->loadHotSpots(sceneS, _sceneResources.propsCount);
+		_sceneResources->hotspots->loadHotSpots(sceneS, _sceneResources->hotspotCount);
+		_sceneResources->parallax->loadHotSpots(sceneS, _sceneResources->parallaxCount);
+		_sceneResources->props->loadHotSpots(sceneS, _sceneResources->propsCount);
 
 		// Note that toss() deletes the MemoryReadStream
 		_vm->res()->toss(filename);
@@ -147,14 +148,14 @@
 	int hotspotCount = hotspotStream->readUint16LE();
 	delete hotspotStream;
 
-	_sceneResources.hotspotCount = hotspotCount;
+	_sceneResources->hotspotCount = hotspotCount;
 
 	hotspotStream = hotSpotData.getItemStream(1);
 
 	// Clear current hotspot lists
-	_sceneResources.hotspots->clear();
+	_sceneResources->hotspots->clear();
 
-	_sceneResources.hotspots->loadHotSpots(hotspotStream, _sceneResources.hotspotCount);
+	_sceneResources->hotspots->loadHotSpots(hotspotStream, _sceneResources->hotspotCount);
 
 	delete hotspotStream;
 }
@@ -204,19 +205,19 @@
 
 	// taken from set_walker_scaling() in adv_walk.cpp. A proper implementation will need
 	// to store these in global variables
-	int minScaling = FixedDiv(_sceneResources.backScale << 16, 100 << 16);
-	int maxScaling = FixedDiv(_sceneResources.frontScale << 16, 100 << 16);
+	int minScaling = FixedDiv(_sceneResources->backScale << 16, 100 << 16);
+	int maxScaling = FixedDiv(_sceneResources->frontScale << 16, 100 << 16);
 	int scaler;
 
 	_vm->_actor->setWalkerDirection(kFacingSouthEast);
 	//_vm->_actor->setWalkerPalette();
 
 	// taken from set_walker_scaling() in adv_walk.cpp
-	if (_sceneResources.frontY == _sceneResources.backY)
+	if (_sceneResources->frontY == _sceneResources->backY)
 		scaler = 0;
 	else
 		scaler = FixedDiv(maxScaling - minScaling,
-				 (_sceneResources.frontY << 16) - (_sceneResources.backY << 16));
+				 (_sceneResources->frontY << 16) - (_sceneResources->backY << 16));
 
 	// FIXME: For now, we (incorrectly) scale the walker to 50% of the scene's max scaling
 	_vm->_actor->setWalkerScaling(scaler / 2);
@@ -232,19 +233,19 @@
 	int i = 0;
 	HotSpot *currentHotSpot;
 	// hotspots (green)
-	for (i = 0; i < _sceneResources.hotspotCount; i++) {
-		currentHotSpot = _sceneResources.hotspots->get(i);
+	for (i = 0; i < _sceneResources->hotspotCount; i++) {
+		currentHotSpot = _sceneResources->hotspots->get(i);
 		_backgroundSurface->frameRect(currentHotSpot->getRect(), _vm->_palette->GREEN);
 	}
 	if (_vm->isM4()) {
 		// parallax (yellow)
-		for (i = 0; i < _sceneResources.parallaxCount; i++) {
-			currentHotSpot = _sceneResources.parallax->get(i);
+		for (i = 0; i < _sceneResources->parallaxCount; i++) {
+			currentHotSpot = _sceneResources->parallax->get(i);
 			_backgroundSurface->frameRect(currentHotSpot->getRect(), _vm->_palette->YELLOW);
 		}
 		// props (red)
-		for (i = 0; i < _sceneResources.propsCount; i++) {
-			currentHotSpot = _sceneResources.props->get(i);
+		for (i = 0; i < _sceneResources->propsCount; i++) {
+			currentHotSpot = _sceneResources->props->get(i);
 			_backgroundSurface->frameRect(currentHotSpot->getRect(), _vm->_palette->RED);
 		}
 	}

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-03-10 11:26:27 UTC (rev 48222)
+++ scummvm/trunk/engines/m4/scene.h	2010-03-10 11:43:48 UTC (rev 48223)
@@ -58,7 +58,8 @@
 	kVerbWalkTo	= 13
 };
 
-struct SceneResources {
+class SceneResources {
+public:
 	char artBase[MAX_CHK_FILENAME_SIZE];
 	char pictureBase[MAX_CHK_FILENAME_SIZE];
 	int32 hotspotCount;
@@ -89,9 +90,9 @@
 	M4Surface *_walkSurface;
 	RGBList *_palData;
 	RGBList *_interfacePal;
-	SceneResources _sceneResources;
+	SceneResources *_sceneResources;
 public:
-	Scene(MadsM4Engine *vm);
+	Scene(MadsM4Engine *vm, SceneResources *res);
 	virtual ~Scene();
 
 	// Methods that differ between engines
@@ -122,7 +123,7 @@
 	void hideInterface();
 	void showMADSV2TextBox(char *text, int x, int y, char *faceName);
 	GameInterfaceView *getInterface() { return _interfaceSurface; };
-	SceneResources getSceneResources() { return _sceneResources; };
+	SceneResources &getSceneResources() { return *_sceneResources; };
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
 	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);

Modified: scummvm/trunk/engines/m4/staticres.cpp
===================================================================
--- scummvm/trunk/engines/m4/staticres.cpp	2010-03-10 11:26:27 UTC (rev 48222)
+++ scummvm/trunk/engines/m4/staticres.cpp	2010-03-10 11:43:48 UTC (rev 48223)
@@ -41,6 +41,7 @@
 const char *lookAroundStr = "Look around";
 const char *toStr = "to ";
 const char *useStr = "Use ";
+const char *walkToStr = "Walk to ";
 
 VerbInit verbList[10] = {
 	{kVerbLook, 2, 0},

Modified: scummvm/trunk/engines/m4/staticres.h
===================================================================
--- scummvm/trunk/engines/m4/staticres.h	2010-03-10 11:26:27 UTC (rev 48222)
+++ scummvm/trunk/engines/m4/staticres.h	2010-03-10 11:43:48 UTC (rev 48223)
@@ -39,6 +39,7 @@
 extern const char *lookAroundStr;
 extern const char *toStr;
 extern const char *useStr;
+extern const char *walkToStr;
 
 struct VerbInit {
 	int verb;


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

Revision: 48256
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48256&view=rev
Author:   dreammaster
Date:     2010-03-14 05:39:47 +0000 (Sun, 14 Mar 2010)

Log Message:
-----------
Further work on separating M4 specific scene code into the m4_scene.cpp file

Modified Paths:
--------------
    scummvm/trunk/engines/m4/actor.cpp
    scummvm/trunk/engines/m4/graphics.cpp
    scummvm/trunk/engines/m4/graphics.h
    scummvm/trunk/engines/m4/hotspot.h
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/m4_scene.cpp
    scummvm/trunk/engines/m4/m4_scene.h
    scummvm/trunk/engines/m4/mads_scene.cpp
    scummvm/trunk/engines/m4/mads_scene.h
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h
    scummvm/trunk/engines/m4/woodscript.h
    scummvm/trunk/engines/m4/ws_sequence.cpp

Modified: scummvm/trunk/engines/m4/actor.cpp
===================================================================
--- scummvm/trunk/engines/m4/actor.cpp	2010-03-14 03:40:16 UTC (rev 48255)
+++ scummvm/trunk/engines/m4/actor.cpp	2010-03-14 05:39:47 UTC (rev 48256)
@@ -59,7 +59,7 @@
 	info.height = info.sprite->height();
 	info.scaleX = info.scaleY = _scaling;
 	info.palette = _walkerSprites[_direction]->getPalette();
-	info.inverseColorTable = _vm->_scene->getInverseColorTable();
+	info.inverseColourTable = _m4Vm->scene()->getInverseColourTable();
 
 	_vm->_scene->drawSprite(x, y, info, Common::Rect(640, 400));
 }

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2010-03-14 03:40:16 UTC (rev 48255)
+++ scummvm/trunk/engines/m4/graphics.cpp	2010-03-14 05:39:47 UTC (rev 48256)
@@ -282,7 +282,7 @@
 							r = CLIP((info.palette[destPixel].r * pixel) >> 10, 0, 31);
 							g = CLIP((info.palette[destPixel].g * pixel) >> 10, 0, 31);
 							b = CLIP((info.palette[destPixel].b * pixel) >> 10, 0, 31);
-							pixel = info.inverseColorTable[(b << 10) | (g << 5) | r];
+							pixel = info.inverseColourTable[(b << 10) | (g << 5) | r];
 						}
 					}
 

Modified: scummvm/trunk/engines/m4/graphics.h
===================================================================
--- scummvm/trunk/engines/m4/graphics.h	2010-03-14 03:40:16 UTC (rev 48255)
+++ scummvm/trunk/engines/m4/graphics.h	2010-03-14 05:39:47 UTC (rev 48256)
@@ -81,7 +81,7 @@
 	int width, height;
 	int scaleX, scaleY;
 	uint8 encoding;
-	byte *inverseColorTable;
+	byte *inverseColourTable;
 	RGB8 *palette;
 };
 

Modified: scummvm/trunk/engines/m4/hotspot.h
===================================================================
--- scummvm/trunk/engines/m4/hotspot.h	2010-03-14 03:40:16 UTC (rev 48255)
+++ scummvm/trunk/engines/m4/hotspot.h	2010-03-14 05:39:47 UTC (rev 48256)
@@ -96,6 +96,7 @@
 
 	int add(HotSpot *hotspot, bool head = false);
 	HotSpot *get(int index) { return _hotspots[index]; }
+	HotSpot &operator[](int idx) { return *get(idx); }
 	void remove(HotSpot *hotspot);
 	void unlinkItem(HotSpot *hotspot);
 	void clear();

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2010-03-14 03:40:16 UTC (rev 48255)
+++ scummvm/trunk/engines/m4/m4.cpp	2010-03-14 05:39:47 UTC (rev 48256)
@@ -412,7 +412,7 @@
 			_scene->loadScene(_kernel->currentRoom);
 
 			_ws->setBackgroundSurface(_scene->getBackgroundSurface());
-			_ws->setInverseColorTable(_scene->getInverseColorTable());
+			_ws->setInverseColourTable(scene()->getInverseColourTable());
 
 			_kernel->loadSectionScriptFunctions();
 			_kernel->loadRoomScriptFunctions();

Modified: scummvm/trunk/engines/m4/m4_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_scene.cpp	2010-03-14 03:40:16 UTC (rev 48255)
+++ scummvm/trunk/engines/m4/m4_scene.cpp	2010-03-14 05:39:47 UTC (rev 48256)
@@ -42,6 +42,7 @@
 	_vm = vm;
 	_sceneSprites = NULL;
 	_interfaceSurface = new M4InterfaceView(vm);
+	_inverseColourTable = NULL;
 }
 
 M4Scene::~M4Scene() {
@@ -59,6 +60,63 @@
 	printf("Scene has %d sprites, each one having %d colors\n", _sceneSprites->getCount(), _sceneSprites->getColorCount());
 }
 
+void M4Scene::loadSceneResources(int sceneNumber) {
+	char filename[kM4MaxFilenameSize];
+	int i = 0, x = 0, y = 0;
+	sprintf(filename, "%i.chk", sceneNumber);
+
+	Common::SeekableReadStream *sceneS = _vm->res()->get(filename);
+
+	if (sceneS != NULL) {
+		sceneS->read(_sceneResources.artBase, MAX_CHK_FILENAME_SIZE);
+		sceneS->read(_sceneResources.pictureBase, MAX_CHK_FILENAME_SIZE);
+		_sceneResources.hotspotCount = sceneS->readUint32LE();
+		_sceneResources.parallaxCount = sceneS->readUint32LE();
+		_sceneResources.propsCount = sceneS->readUint32LE();
+		_sceneResources.frontY = sceneS->readUint32LE();
+		_sceneResources.backY = sceneS->readUint32LE();
+		_sceneResources.frontScale = sceneS->readUint32LE();
+		_sceneResources.backScale = sceneS->readUint32LE();
+		for (i = 0; i < 16; i++)
+			_sceneResources.depthTable[i] = sceneS->readUint16LE();
+		_sceneResources.railNodeCount = sceneS->readUint32LE();
+
+		// Clear rails from previous scene
+		_vm->_rails->clearRails();
+
+		for (i = 0; i < _sceneResources.railNodeCount; i++) {
+			x = sceneS->readUint32LE();
+			y = sceneS->readUint32LE();
+			if (_vm->_rails->addRailNode(x, y, true) < 0) {
+				warning("Too many rail nodes defined for scene");
+			}
+		}
+
+		// Clear current hotspot lists
+		_sceneResources.hotspots->clear();
+		_sceneResources.parallax->clear();
+		_sceneResources.props->clear();
+
+		_sceneResources.hotspots->loadHotSpots(sceneS, _sceneResources.hotspotCount);
+		_sceneResources.parallax->loadHotSpots(sceneS, _sceneResources.parallaxCount);
+		_sceneResources.props->loadHotSpots(sceneS, _sceneResources.propsCount);
+
+		// Note that toss() deletes the MemoryReadStream
+		_vm->res()->toss(filename);
+	}
+}
+
+void M4Scene::loadSceneInverseColourTable(int sceneNumber) {
+	char filename[kM4MaxFilenameSize];
+	Common::SeekableReadStream *iplS;
+
+	sprintf(filename, "%i.ipl", sceneNumber);
+	iplS = _vm->res()->openFile(filename);
+	delete[] _inverseColourTable;
+	_inverseColourTable = new byte[iplS->size()];
+	iplS->read(_inverseColourTable, iplS->size());
+	_vm->res()->toss(filename);
+}
 void M4Scene::loadScene(int sceneNumber) {
 	Scene::loadScene(sceneNumber);
 
@@ -71,7 +129,6 @@
 
 	// Load scene def file (*.CHK)
 	loadSceneResources(sceneNumber);
-	loadSceneInverseColorTable(sceneNumber);
 
 	// TODO: set walker scaling
 	// TODO: destroy woodscript buffer
@@ -80,7 +137,7 @@
 	loadSceneCodes(sceneNumber);
 
 	// Load inverse color table file (*.IPL)
-	loadSceneInverseColorTable(sceneNumber);
+	loadSceneInverseColourTable(sceneNumber);
 
 	if (_vm->getGameType() != GType_Burger) {
 		// Load scene sprites file (*.SSB)
@@ -115,6 +172,12 @@
 	_vm->_viewManager->addView(_interfaceSurface);
 }
 
+void M4Scene::leaveScene() {
+	delete[] _inverseColourTable;
+
+	Scene::leaveScene();
+}
+
 void M4Scene::checkHotspotAtMousePos(int x, int y) {
 	if (_vm->getGameType() == GType_Riddle)
 		return;

Modified: scummvm/trunk/engines/m4/m4_scene.h
===================================================================
--- scummvm/trunk/engines/m4/m4_scene.h	2010-03-14 03:40:16 UTC (rev 48255)
+++ scummvm/trunk/engines/m4/m4_scene.h	2010-03-14 05:39:47 UTC (rev 48256)
@@ -50,8 +50,11 @@
 	M4SceneResources _sceneResources;
 	SpriteAsset *_sceneSprites;
 	SpriteAsset *_walkerSprite;
+	byte *_inverseColourTable;
 
 	void loadSceneSprites(int sceneNumber);
+	void loadSceneResources(int sceneNumber);
+	void loadSceneInverseColourTable(int sceneNumber);
 	void nextCommonCursor();
 public:
 	M4Scene(M4Engine *vm);
@@ -59,7 +62,7 @@
 
 	// Methods that differ between engines
 	virtual void loadScene(int sceneNumber);
-	virtual void leaveScene() {};
+	virtual void leaveScene();
 	virtual void loadSceneCodes(int sceneNumber, int index = 0);
 	virtual void show();
 	virtual void checkHotspotAtMousePos(int x, int y);
@@ -69,6 +72,7 @@
 	virtual void setStatusText(const char *text);
 	virtual void update();
 
+	byte *getInverseColourTable() const { return _inverseColourTable; }
 	M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; };
 	M4SceneResources &getSceneResources() { return _sceneResources; };
 };

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-03-14 03:40:16 UTC (rev 48255)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-03-14 05:39:47 UTC (rev 48256)
@@ -93,13 +93,7 @@
 	if (_currentScene >= 900)
 		return;
 
-	loadSceneHotSpotsMads(_currentScene);
-
-	// TODO: set walker scaling
-	// TODO: destroy woodscript buffer
-
-	// Load inverse color table file (*.IPL)
-	loadSceneInverseColorTable(_currentScene);
+	loadSceneHotspots(_currentScene);
 }
 
 void MadsScene::loadScene(int sceneNumber) {
@@ -132,6 +126,27 @@
 	_vm->res()->purge();
 }
 
+void MadsScene::loadSceneHotspots(int sceneNumber) {
+	char filename[kM4MaxFilenameSize];
+	sprintf(filename, "rm%i.hh", sceneNumber);
+	MadsPack hotSpotData(filename, _vm);
+	Common::SeekableReadStream *hotspotStream = hotSpotData.getItemStream(0);
+
+	int hotspotCount = hotspotStream->readUint16LE();
+	delete hotspotStream;
+
+	_sceneResources.hotspotCount = hotspotCount;
+
+	hotspotStream = hotSpotData.getItemStream(1);
+
+	// Clear current hotspot lists
+	_sceneResources.hotspots->clear();
+
+	_sceneResources.hotspots->loadHotSpots(hotspotStream, _sceneResources.hotspotCount);
+
+	delete hotspotStream;
+}
+
 void MadsScene::leaveScene() {
 	_sceneResources.hotspots->clear();
 	_sceneResources.parallax->clear();
@@ -453,7 +468,7 @@
 
 					if (_currentHotspot < hotspotCount) {
 						// Get the verb Id from the hotspot
-						verbId = 0;//selected hotspot
+						verbId = (*_madsVm->scene()->getSceneResources().hotspots)[_currentHotspot].getVerbID();
 					} else {
 						// Get the verb Id from the scene object
 						verbId = 0;//Scene_object[_currentHotspot - _hotspotCount].verbId;

Modified: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	2010-03-14 03:40:16 UTC (rev 48255)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-03-14 05:39:47 UTC (rev 48256)
@@ -168,6 +168,7 @@
 	void drawElements();
 	void loadScene2(const char *aaName);
 	void loadSceneTemporary();
+	void loadSceneHotspots(int sceneNumber);
 	void clearAction();
 	void appendActionVocab(int vocabId, bool capitalise);
 	void setAction();

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-03-14 03:40:16 UTC (rev 48255)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-03-14 05:39:47 UTC (rev 48256)
@@ -51,7 +51,6 @@
 	_palData = NULL;
 	_interfacePal = NULL;
 	_interfaceSurface = NULL;
-	_inverseColorTable = NULL;
 	_vm->_rails->setCodeSurface(_walkSurface);
 }
 
@@ -78,7 +77,6 @@
 void Scene::leaveScene() {
 	delete _palData;
 	delete _interfacePal;
-	delete[] _inverseColorTable;
 }
 
 void Scene::show() {
@@ -93,91 +91,6 @@
 	_vm->_viewManager->deleteView(_interfaceSurface);
 }
 
-void Scene::loadSceneResources(int sceneNumber) {
-	char filename[kM4MaxFilenameSize];
-	int i = 0, x = 0, y = 0;
-	sprintf(filename, "%i.chk", sceneNumber);
-
-	Common::SeekableReadStream *sceneS = _vm->res()->get(filename);
-
-	if (sceneS != NULL) {
-		sceneS->read(_sceneResources->artBase, MAX_CHK_FILENAME_SIZE);
-		sceneS->read(_sceneResources->pictureBase, MAX_CHK_FILENAME_SIZE);
-		_sceneResources->hotspotCount = sceneS->readUint32LE();
-		_sceneResources->parallaxCount = sceneS->readUint32LE();
-		_sceneResources->propsCount = sceneS->readUint32LE();
-		_sceneResources->frontY = sceneS->readUint32LE();
-		_sceneResources->backY = sceneS->readUint32LE();
-		_sceneResources->frontScale = sceneS->readUint32LE();
-		_sceneResources->backScale = sceneS->readUint32LE();
-		for (i = 0; i < 16; i++)
-			_sceneResources->depthTable[i] = sceneS->readUint16LE();
-		_sceneResources->railNodeCount = sceneS->readUint32LE();
-
-		// Clear rails from previous scene
-		_vm->_rails->clearRails();
-
-		for (i = 0; i < _sceneResources->railNodeCount; i++) {
-			x = sceneS->readUint32LE();
-			y = sceneS->readUint32LE();
-			if (_vm->_rails->addRailNode(x, y, true) < 0) {
-				warning("Too many rail nodes defined for scene");
-			}
-		}
-
-		// Clear current hotspot lists
-		_sceneResources->hotspots->clear();
-		_sceneResources->parallax->clear();
-		_sceneResources->props->clear();
-
-		_sceneResources->hotspots->loadHotSpots(sceneS, _sceneResources->hotspotCount);
-		_sceneResources->parallax->loadHotSpots(sceneS, _sceneResources->parallaxCount);
-		_sceneResources->props->loadHotSpots(sceneS, _sceneResources->propsCount);
-
-		// Note that toss() deletes the MemoryReadStream
-		_vm->res()->toss(filename);
-	}
-}
-
-void Scene::loadSceneHotSpotsMads(int sceneNumber) {
-	char filename[kM4MaxFilenameSize];
-	sprintf(filename, "rm%i.hh", sceneNumber);
-	MadsPack hotSpotData(filename, _vm);
-	Common::SeekableReadStream *hotspotStream = hotSpotData.getItemStream(0);
-
-	int hotspotCount = hotspotStream->readUint16LE();
-	delete hotspotStream;
-
-	_sceneResources->hotspotCount = hotspotCount;
-
-	hotspotStream = hotSpotData.getItemStream(1);
-
-	// Clear current hotspot lists
-	_sceneResources->hotspots->clear();
-
-	_sceneResources->hotspots->loadHotSpots(hotspotStream, _sceneResources->hotspotCount);
-
-	delete hotspotStream;
-}
-
-void Scene::loadSceneInverseColorTable(int sceneNumber) {
-	char filename[kM4MaxFilenameSize];
-	Common::SeekableReadStream *iplS;
-
-	if (_vm->isM4()) {
-		sprintf(filename, "%i.ipl", sceneNumber);
-		iplS = _vm->res()->openFile(filename);
-		delete[] _inverseColorTable;
-		_inverseColorTable = new byte[iplS->size()];
-		iplS->read(_inverseColorTable, iplS->size());
-		_vm->res()->toss(filename);
-	} else {
-		// TODO?
-		return;
-	}
-
-}
-
 void Scene::loadSceneSpriteCodes(int sceneNumber) {
 	char filename[kM4MaxFilenameSize];
 	sprintf(filename, "%i.ssc", sceneNumber);

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-03-14 03:40:16 UTC (rev 48255)
+++ scummvm/trunk/engines/m4/scene.h	2010-03-14 05:39:47 UTC (rev 48256)
@@ -80,7 +80,6 @@
 
 class Scene : public View {
 private:
-	byte *_inverseColorTable;
 	HotSpotList _sceneHotspots;
 protected:
 	int _currentScene;
@@ -109,16 +108,12 @@
 
 	// TODO: perhaps move playIntro() someplace else?
 	void playIntro();
-	void loadSceneResources(int sceneNumber);
-	void loadSceneHotSpotsMads(int sceneNumber);
-	void loadSceneInverseColorTable(int sceneNumber);
 	void loadSceneSpriteCodes(int sceneNumber);
 	void showSprites();
 	void showHotSpots();
 	void showCodes();
 	int getCurrentScene() { return _currentScene; }
 	M4Surface *getBackgroundSurface() const { return _backgroundSurface; }
-	byte *getInverseColorTable() const { return _inverseColorTable; }
 	void showInterface();
 	void hideInterface();
 	void showMADSV2TextBox(char *text, int x, int y, char *faceName);

Modified: scummvm/trunk/engines/m4/woodscript.h
===================================================================
--- scummvm/trunk/engines/m4/woodscript.h	2010-03-14 03:40:16 UTC (rev 48255)
+++ scummvm/trunk/engines/m4/woodscript.h	2010-03-14 05:39:47 UTC (rev 48256)
@@ -319,8 +319,8 @@
 
 	RGB8 *getMainPalette() const;
 
-	void setInverseColorTable(byte *inverseColorTable) { _inverseColorTable = inverseColorTable; }
-	byte *getInverseColorTable() const { return _inverseColorTable; }
+	void setInverseColourTable(byte *inverseColourTable) { _inverseColourTable = inverseColourTable; }
+	byte *getInverseColourTable() const { return _inverseColourTable; }
 
 protected:
 	MadsM4Engine *_vm;
@@ -338,7 +338,7 @@
 
 	/* Misc */
 	int16 *_depthTable;
-	byte *_inverseColorTable;
+	byte *_inverseColourTable;
 	M4Surface *_backgroundSurface;
 	View *_surfaceView;
 

Modified: scummvm/trunk/engines/m4/ws_sequence.cpp
===================================================================
--- scummvm/trunk/engines/m4/ws_sequence.cpp	2010-03-14 03:40:16 UTC (rev 48255)
+++ scummvm/trunk/engines/m4/ws_sequence.cpp	2010-03-14 05:39:47 UTC (rev 48256)
@@ -289,7 +289,7 @@
 	info.hotX = _curFrame->xOffset;
 	info.hotY = _curFrame->yOffset;
 	info.encoding = _curFrame->encoding;
-	info.inverseColorTable = _vm->_scene->getInverseColorTable();
+	info.inverseColourTable = _m4Vm->scene()->getInverseColourTable();
 	info.palette = _ws->getMainPalette();
 	info.width = _curFrame->width();
 	info.height = _curFrame->height();


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

Revision: 48257
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48257&view=rev
Author:   dreammaster
Date:     2010-03-14 05:47:33 +0000 (Sun, 14 Mar 2010)

Log Message:
-----------
Further separation of MADS and M4 scene logic

Modified Paths:
--------------
    scummvm/trunk/engines/m4/m4_scene.cpp
    scummvm/trunk/engines/m4/m4_scene.h
    scummvm/trunk/engines/m4/mads_scene.cpp
    scummvm/trunk/engines/m4/mads_scene.h
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h

Modified: scummvm/trunk/engines/m4/m4_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_scene.cpp	2010-03-14 05:39:47 UTC (rev 48256)
+++ scummvm/trunk/engines/m4/m4_scene.cpp	2010-03-14 05:47:33 UTC (rev 48257)
@@ -117,6 +117,28 @@
 	iplS->read(_inverseColourTable, iplS->size());
 	_vm->res()->toss(filename);
 }
+
+void M4Scene::loadSceneSpriteCodes(int sceneNumber) {
+	char filename[kM4MaxFilenameSize];
+	sprintf(filename, "%i.ssc", sceneNumber);
+
+	Common::SeekableReadStream *sceneS = _vm->res()->get(filename);
+
+	// TODO
+
+	if (sceneS != NULL) {
+		SpriteAsset* _sceneSpriteCodes = new SpriteAsset(_vm, sceneS, sceneS->size(), filename);
+		int colorCount = _sceneSpriteCodes->getColorCount();
+//			RGB8* spritePalette = _sceneSpriteCodes->getPalette();
+		//_vm->_palette->setPalette(spritePalette, 0, colorCount);
+
+		printf("Scene has %d sprite codes, each one having %d colors\n", _sceneSpriteCodes->getCount(), colorCount);
+
+		// Note that toss() deletes the MemoryReadStream
+		_vm->res()->toss(filename);
+	}
+}
+
 void M4Scene::loadScene(int sceneNumber) {
 	Scene::loadScene(sceneNumber);
 

Modified: scummvm/trunk/engines/m4/m4_scene.h
===================================================================
--- scummvm/trunk/engines/m4/m4_scene.h	2010-03-14 05:39:47 UTC (rev 48256)
+++ scummvm/trunk/engines/m4/m4_scene.h	2010-03-14 05:47:33 UTC (rev 48257)
@@ -55,6 +55,7 @@
 	void loadSceneSprites(int sceneNumber);
 	void loadSceneResources(int sceneNumber);
 	void loadSceneInverseColourTable(int sceneNumber);
+	void loadSceneSpriteCodes(int sceneNumber);
 	void nextCommonCursor();
 public:
 	M4Scene(M4Engine *vm);

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-03-14 05:39:47 UTC (rev 48256)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-03-14 05:47:33 UTC (rev 48257)
@@ -370,6 +370,104 @@
 	error("Couldn't find player sprites");
 }
 
+enum boxSprites {
+	topLeft = 0,
+	topRight = 1,
+	bottomLeft = 2,
+	bottomRight = 3,
+	left = 4,
+	right = 5,
+	top = 6,
+	bottom = 7,
+	topMiddle = 8,
+	filler1 = 9,
+	filler2 = 10
+	// TODO: finish this
+};
+
+// TODO: calculate width and height, show text, show face if it exists
+// TODO: this has been tested with Dragonsphere only, there are some differences
+// in the sprites used in Phantom
+void MadsScene::showMADSV2TextBox(char *text, int x, int y, char *faceName) {
+	int repeatX = 40;	// FIXME: this is hardcoded
+	int repeatY = 30;	// FIXME: this is hardcoded
+	int curX = x, curY = y;
+	int topRightX = x;	// TODO: this is probably not needed
+	Common::SeekableReadStream *data = _vm->res()->get("box.ss");
+	SpriteAsset *boxSprites = new SpriteAsset(_vm, data, data->size(), "box.ss");
+	_vm->res()->toss("box.ss");
+
+	RGBList *palData = new RGBList(boxSprites->getColorCount(), boxSprites->getPalette(), true);
+	_vm->_palette->addRange(palData);
+
+	for (int i = 0; i < boxSprites->getCount(); i++)
+		boxSprites->getFrame(i)->translate(palData);		// sprite pixel translation
+
+	// Top left corner
+	boxSprites->getFrame(topLeft)->copyTo(_backgroundSurface, x, curY);
+	curX += boxSprites->getFrame(topLeft)->width();
+
+	// Top line
+	for (int i = 0; i < repeatX; i++) {
+		boxSprites->getFrame(top)->copyTo(_backgroundSurface, curX, curY + 3);
+		curX += boxSprites->getFrame(top)->width();
+	}
+
+	// Top right corner
+	boxSprites->getFrame(topRight)->copyTo(_backgroundSurface, curX, curY);
+	topRightX = curX;
+
+	// Top middle
+	// FIXME: the transparent color for this is also the black border color
+	boxSprites->getFrame(topMiddle)->copyTo(_backgroundSurface,
+											x + (curX - x) / 2 - boxSprites->getFrame(topMiddle)->width() / 2,
+											curY - 5, 167);
+	curX = x;
+	curY += boxSprites->getFrame(topLeft)->height();
+
+	// -----------------------------------------------------------------------------------------------
+
+	// Draw contents
+	for (int i = 0; i < repeatY; i++) {
+		for (int j = 0; j < repeatX; j++) {
+			if (j == 0) {
+				boxSprites->getFrame(left)->copyTo(_backgroundSurface, curX + 3, curY);
+				curX += boxSprites->getFrame(left)->width();
+			} else if (j == repeatX - 1) {
+				curX = topRightX - 2;
+				boxSprites->getFrame(right)->copyTo(_backgroundSurface, curX + 3, curY + 1);
+			} else {
+				// TODO: the background of the contents follows a pattern which is not understood yet
+				if (j % 2 == 0) {
+					boxSprites->getFrame(filler1)->copyTo(_backgroundSurface, curX + 3, curY);
+					curX += boxSprites->getFrame(filler1)->width();
+				} else {
+					boxSprites->getFrame(filler2)->copyTo(_backgroundSurface, curX + 3, curY);
+					curX += boxSprites->getFrame(filler2)->width();
+				}
+			}
+		}	// for j
+		curX = x;
+		curY += boxSprites->getFrame(left)->height();
+	}	// for i
+
+	// -----------------------------------------------------------------------------------------------
+	curX = x;
+
+	// Bottom left corner
+	boxSprites->getFrame(bottomLeft)->copyTo(_backgroundSurface, curX, curY);
+	curX += boxSprites->getFrame(bottomLeft)->width();
+
+	// Bottom line
+	for (int i = 0; i < repeatX; i++) {
+		boxSprites->getFrame(bottom)->copyTo(_backgroundSurface, curX, curY + 1);
+		curX += boxSprites->getFrame(bottom)->width();
+	}
+
+	// Bottom right corner
+	boxSprites->getFrame(bottomRight)->copyTo(_backgroundSurface, curX, curY + 1);
+}
+
 /*--------------------------------------------------------------------------*/
 
 MadsAction::MadsAction() {

Modified: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	2010-03-14 05:39:47 UTC (rev 48256)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-03-14 05:47:33 UTC (rev 48257)
@@ -192,6 +192,7 @@
 
 	int loadSceneSpriteSet(const char *setName);
 	void loadPlayerSprites(const char *prefix);
+	void showMADSV2TextBox(char *text, int x, int y, char *faceName);
 
 	MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; };
 	MadsSceneResources &getSceneResources() { return _sceneResources; };

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-03-14 05:39:47 UTC (rev 48256)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-03-14 05:47:33 UTC (rev 48257)
@@ -91,27 +91,6 @@
 	_vm->_viewManager->deleteView(_interfaceSurface);
 }
 
-void Scene::loadSceneSpriteCodes(int sceneNumber) {
-	char filename[kM4MaxFilenameSize];
-	sprintf(filename, "%i.ssc", sceneNumber);
-
-	Common::SeekableReadStream *sceneS = _vm->res()->get(filename);
-
-	// TODO
-
-	if (sceneS != NULL) {
-		SpriteAsset* _sceneSpriteCodes = new SpriteAsset(_vm, sceneS, sceneS->size(), filename);
-		int colorCount = _sceneSpriteCodes->getColorCount();
-//			RGB8* spritePalette = _sceneSpriteCodes->getPalette();
-		//_vm->_palette->setPalette(spritePalette, 0, colorCount);
-
-		printf("Scene has %d sprite codes, each one having %d colors\n", _sceneSpriteCodes->getCount(), colorCount);
-
-		// Note that toss() deletes the MemoryReadStream
-		_vm->res()->toss(filename);
-	}
-}
-
 void Scene::showSprites() {
 	// TODO: This is all experimental code, it needs heavy restructuring
 	// and cleanup
@@ -222,102 +201,4 @@
 	return true;
 }
 
-enum boxSprites {
-	topLeft = 0,
-	topRight = 1,
-	bottomLeft = 2,
-	bottomRight = 3,
-	left = 4,
-	right = 5,
-	top = 6,
-	bottom = 7,
-	topMiddle = 8,
-	filler1 = 9,
-	filler2 = 10
-	// TODO: finish this
-};
-
-// TODO: calculate width and height, show text, show face if it exists
-// TODO: this has been tested with Dragonsphere only, there are some differences
-// in the sprites used in Phantom
-void Scene::showMADSV2TextBox(char *text, int x, int y, char *faceName) {
-	int repeatX = 40;	// FIXME: this is hardcoded
-	int repeatY = 30;	// FIXME: this is hardcoded
-	int curX = x, curY = y;
-	int topRightX = x;	// TODO: this is probably not needed
-	Common::SeekableReadStream *data = _vm->res()->get("box.ss");
-	SpriteAsset *boxSprites = new SpriteAsset(_vm, data, data->size(), "box.ss");
-	_vm->res()->toss("box.ss");
-
-	RGBList *palData = new RGBList(boxSprites->getColorCount(), boxSprites->getPalette(), true);
-	_vm->_palette->addRange(palData);
-
-	for (int i = 0; i < boxSprites->getCount(); i++)
-		boxSprites->getFrame(i)->translate(palData);		// sprite pixel translation
-
-	// Top left corner
-	boxSprites->getFrame(topLeft)->copyTo(_backgroundSurface, x, curY);
-	curX += boxSprites->getFrame(topLeft)->width();
-
-	// Top line
-	for (int i = 0; i < repeatX; i++) {
-		boxSprites->getFrame(top)->copyTo(_backgroundSurface, curX, curY + 3);
-		curX += boxSprites->getFrame(top)->width();
-	}
-
-	// Top right corner
-	boxSprites->getFrame(topRight)->copyTo(_backgroundSurface, curX, curY);
-	topRightX = curX;
-
-	// Top middle
-	// FIXME: the transparent color for this is also the black border color
-	boxSprites->getFrame(topMiddle)->copyTo(_backgroundSurface,
-											x + (curX - x) / 2 - boxSprites->getFrame(topMiddle)->width() / 2,
-											curY - 5, 167);
-	curX = x;
-	curY += boxSprites->getFrame(topLeft)->height();
-
-	// -----------------------------------------------------------------------------------------------
-
-	// Draw contents
-	for (int i = 0; i < repeatY; i++) {
-		for (int j = 0; j < repeatX; j++) {
-			if (j == 0) {
-				boxSprites->getFrame(left)->copyTo(_backgroundSurface, curX + 3, curY);
-				curX += boxSprites->getFrame(left)->width();
-			} else if (j == repeatX - 1) {
-				curX = topRightX - 2;
-				boxSprites->getFrame(right)->copyTo(_backgroundSurface, curX + 3, curY + 1);
-			} else {
-				// TODO: the background of the contents follows a pattern which is not understood yet
-				if (j % 2 == 0) {
-					boxSprites->getFrame(filler1)->copyTo(_backgroundSurface, curX + 3, curY);
-					curX += boxSprites->getFrame(filler1)->width();
-				} else {
-					boxSprites->getFrame(filler2)->copyTo(_backgroundSurface, curX + 3, curY);
-					curX += boxSprites->getFrame(filler2)->width();
-				}
-			}
-		}	// for j
-		curX = x;
-		curY += boxSprites->getFrame(left)->height();
-	}	// for i
-
-	// -----------------------------------------------------------------------------------------------
-	curX = x;
-
-	// Bottom left corner
-	boxSprites->getFrame(bottomLeft)->copyTo(_backgroundSurface, curX, curY);
-	curX += boxSprites->getFrame(bottomLeft)->width();
-
-	// Bottom line
-	for (int i = 0; i < repeatX; i++) {
-		boxSprites->getFrame(bottom)->copyTo(_backgroundSurface, curX, curY + 1);
-		curX += boxSprites->getFrame(bottom)->width();
-	}
-
-	// Bottom right corner
-	boxSprites->getFrame(bottomRight)->copyTo(_backgroundSurface, curX, curY + 1);
-}
-
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-03-14 05:39:47 UTC (rev 48256)
+++ scummvm/trunk/engines/m4/scene.h	2010-03-14 05:47:33 UTC (rev 48257)
@@ -108,7 +108,6 @@
 
 	// TODO: perhaps move playIntro() someplace else?
 	void playIntro();
-	void loadSceneSpriteCodes(int sceneNumber);
 	void showSprites();
 	void showHotSpots();
 	void showCodes();
@@ -116,7 +115,6 @@
 	M4Surface *getBackgroundSurface() const { return _backgroundSurface; }
 	void showInterface();
 	void hideInterface();
-	void showMADSV2TextBox(char *text, int x, int y, char *faceName);
 	GameInterfaceView *getInterface() { return _interfaceSurface; };
 	SceneResources &getSceneResources() { return *_sceneResources; };
 


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

Revision: 48266
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48266&view=rev
Author:   dreammaster
Date:     2010-03-16 08:26:08 +0000 (Tue, 16 Mar 2010)

Log Message:
-----------
Further code implemented for the current action display

Modified Paths:
--------------
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/hotspot.h
    scummvm/trunk/engines/m4/m4_scene.cpp
    scummvm/trunk/engines/m4/m4_scene.h
    scummvm/trunk/engines/m4/mads_scene.cpp
    scummvm/trunk/engines/m4/mads_scene.h
    scummvm/trunk/engines/m4/mads_views.h
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/scene.h
    scummvm/trunk/engines/m4/staticres.cpp
    scummvm/trunk/engines/m4/staticres.h

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2010-03-15 22:24:52 UTC (rev 48265)
+++ scummvm/trunk/engines/m4/console.cpp	2010-03-16 08:26:08 UTC (rev 48266)
@@ -103,7 +103,7 @@
 	_vm->_scene->getSceneResources().hotspots->dump();
 	if (_vm->isM4()) {
 		DebugPrintf("Scene parallax\n");
-		_vm->_scene->getSceneResources().parallax->dump();
+		_m4Vm->scene()->getSceneResources().parallax->dump();
 		DebugPrintf("Scene props\n");
 		_vm->_scene->getSceneResources().props->dump();
 	}
@@ -395,23 +395,23 @@
 }
 
 bool M4Console::cmdSceneInfo(int argc, const char **argv) {
-	DebugPrintf("Current scene is: %i\n", _vm->_scene->getCurrentScene());
+	DebugPrintf("Current scene is: %i\n", _m4Vm->scene()->getCurrentScene());
 
 	DebugPrintf("Scene resources:\n");
-	DebugPrintf("artBase: %s\n", _vm->_scene->getSceneResources().artBase);
-	DebugPrintf("pictureBase: %s\n", _vm->_scene->getSceneResources().pictureBase);
-	DebugPrintf("hotspotCount: %i\n", _vm->_scene->getSceneResources().hotspotCount);
-	DebugPrintf("parallaxCount: %i\n", _vm->_scene->getSceneResources().parallaxCount);
-	DebugPrintf("propsCount: %i\n", _vm->_scene->getSceneResources().propsCount);
-	DebugPrintf("frontY: %i\n", _vm->_scene->getSceneResources().frontY);
-	DebugPrintf("backY: %i\n", _vm->_scene->getSceneResources().backY);
-	DebugPrintf("frontScale: %i\n", _vm->_scene->getSceneResources().frontScale);
-	DebugPrintf("backScale: %i\n", _vm->_scene->getSceneResources().backScale);
+	DebugPrintf("artBase: %s\n", _m4Vm->scene()->getSceneResources().artBase);
+	DebugPrintf("pictureBase: %s\n", _m4Vm->scene()->getSceneResources().pictureBase);
+	DebugPrintf("hotspotCount: %i\n", _m4Vm->scene()->getSceneResources().hotspotCount);
+	DebugPrintf("parallaxCount: %i\n", _m4Vm->scene()->getSceneResources().parallaxCount);
+	DebugPrintf("propsCount: %i\n", _m4Vm->scene()->getSceneResources().propsCount);
+	DebugPrintf("frontY: %i\n", _m4Vm->scene()->getSceneResources().frontY);
+	DebugPrintf("backY: %i\n", _m4Vm->scene()->getSceneResources().backY);
+	DebugPrintf("frontScale: %i\n", _m4Vm->scene()->getSceneResources().frontScale);
+	DebugPrintf("backScale: %i\n", _m4Vm->scene()->getSceneResources().backScale);
 	DebugPrintf("depthTable: ");
 	for (uint i = 0; i < 16; i++)
-		DebugPrintf("%i ", _vm->_scene->getSceneResources().depthTable[i]);
+		DebugPrintf("%i ", _m4Vm->scene()->getSceneResources().depthTable[i]);
 	DebugPrintf("\n");
-	DebugPrintf("railNodeCount: %i\n", _vm->_scene->getSceneResources().railNodeCount);
+	DebugPrintf("railNodeCount: %i\n", _m4Vm->scene()->getSceneResources().railNodeCount);
 
 	return true;
 }

Modified: scummvm/trunk/engines/m4/hotspot.h
===================================================================
--- scummvm/trunk/engines/m4/hotspot.h	2010-03-15 22:24:52 UTC (rev 48265)
+++ scummvm/trunk/engines/m4/hotspot.h	2010-03-16 08:26:08 UTC (rev 48266)
@@ -59,6 +59,7 @@
 	void setRect(int x1, int y1, int x2, int y2);
 	void setFeet(int x, int y);
 	void setFacing(uint8 facing) { _facing = facing; }
+	void setArticle(int8 v) { _articleNumber = v; }
 	char *getVocab() const { return _vocab; }
 	int32 getVocabID() { return _vocabID; }
 	char *getVerb() const { return _verb; }
@@ -70,6 +71,7 @@
 	uint8 getFacing() const { return _facing; }
 	int getFeetX() { return _feetX; }
 	int getFeetY() { return _feetY; }
+	int8 getArticle() const { return _articleNumber; }
 	Common::Rect getRect() const;
 
 	int32 area() const { return (_rect.width() - 1) * (_rect.height() - 1); }
@@ -85,6 +87,8 @@
 	// Unused in Orion Burger, used in MADS games
 	uint8 _syntax;
 	int32 _vocabID, _verbID;
+	int8 _articleNumber;
+
 	//TODO: check if this is actually needed by the game
 	int16 _hash;
 };

Modified: scummvm/trunk/engines/m4/m4_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_scene.cpp	2010-03-15 22:24:52 UTC (rev 48265)
+++ scummvm/trunk/engines/m4/m4_scene.cpp	2010-03-16 08:26:08 UTC (rev 48266)
@@ -41,8 +41,10 @@
 M4Scene::M4Scene(M4Engine *vm): _sceneResources(), Scene(vm, &_sceneResources) {
 	_vm = vm;
 	_sceneSprites = NULL;
+	_inverseColourTable = NULL;
+
+	_sceneResources.parallax = new HotSpotList();
 	_interfaceSurface = new M4InterfaceView(vm);
-	_inverseColourTable = NULL;
 }
 
 M4Scene::~M4Scene() {
@@ -195,6 +197,9 @@
 }
 
 void M4Scene::leaveScene() {
+	_sceneResources.parallax->clear();
+
+	delete _sceneResources.parallax;
 	delete[] _inverseColourTable;
 
 	Scene::leaveScene();
@@ -308,4 +313,14 @@
 	_vm->_mouse->setCursorNum(cursorIndex);
 }
 
+void M4Scene::showHotSpots() {
+	Scene::showHotSpots();
+
+	// parallax (yellow)
+	for (int i = 0; i < _sceneResources.parallaxCount; i++) {
+		HotSpot *currentHotSpot = _sceneResources.parallax->get(i);
+		_backgroundSurface->frameRect(currentHotSpot->getRect(), _vm->_palette->YELLOW);
+	}
+}
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/m4_scene.h
===================================================================
--- scummvm/trunk/engines/m4/m4_scene.h	2010-03-15 22:24:52 UTC (rev 48265)
+++ scummvm/trunk/engines/m4/m4_scene.h	2010-03-16 08:26:08 UTC (rev 48266)
@@ -42,6 +42,9 @@
 	int32 frontScale, backScale;
 	int16 depthTable[16];
 	int32 railNodeCount;	// # of rails
+
+	int32 parallaxCount;
+	HotSpotList *parallax;
 };
 
 class M4Scene : public Scene {
@@ -70,12 +73,13 @@
 	virtual void leftClick(int x, int y);
 	virtual void rightClick(int x, int y);
 	virtual void setAction(int action, int objectId = -1);
-	virtual void setStatusText(const char *text);
 	virtual void update();
+	virtual void showHotSpots();
 
 	byte *getInverseColourTable() const { return _inverseColourTable; }
 	M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; };
 	M4SceneResources &getSceneResources() { return _sceneResources; };
+	void setStatusText(const char *text);
 };
 
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-03-15 22:24:52 UTC (rev 48265)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-03-16 08:26:08 UTC (rev 48266)
@@ -43,7 +43,6 @@
 MadsScene::MadsScene(MadsEngine *vm): _sceneResources(), Scene(vm, &_sceneResources) {
 	_vm = vm;
 
-	strcpy(_statusText, "");
 	_interfaceSurface = new MadsInterfaceView(vm);
 	_spriteSlotsStart = 0;
 	for (int i = 0; i < 3; ++i)
@@ -94,6 +93,8 @@
 		return;
 
 	loadSceneHotspots(_currentScene);
+
+	_action.clear();
 }
 
 void MadsScene::loadScene(int sceneNumber) {
@@ -149,11 +150,9 @@
 
 void MadsScene::leaveScene() {
 	_sceneResources.hotspots->clear();
-	_sceneResources.parallax->clear();
 	_sceneResources.props->clear();
 
 	delete _sceneResources.hotspots;
-	delete _sceneResources.parallax;
 	delete _sceneResources.props;
 
 	// Delete the sprites
@@ -263,10 +262,6 @@
 	setStatusText(statusText);
 }
 
-void MadsScene::setStatusText(const char *text) {
-	strcpy(_statusText, text);
-}
-
 /**
  * Draws all the elements of the scene
  */
@@ -316,8 +311,11 @@
 	// Draw all the various elements
 	drawElements();
 
+	_action.set();
+	const char *sStatusText = _action.statusText();
+
 	// Handle display of any status text
-	if (_statusText[0]) {
+	if (sStatusText[0]) {
 		// Text colors are inverted in Dragonsphere
 		if (_vm->getGameType() == GType_DragonSphere)
 			_vm->_font->setColors(_vm->_palette->BLACK, _vm->_palette->WHITE, _vm->_palette->BLACK);
@@ -325,7 +323,7 @@
 			_vm->_font->setColors(_vm->_palette->WHITE, _vm->_palette->BLACK, _vm->_palette->BLACK);
 
 		_vm->_font->setFont(FONT_MAIN_MADS);
-		_vm->_font->writeString(this, _statusText, (width() - _vm->_font->getWidth(_statusText)) / 2, 142, 0);
+		_vm->_font->writeString(this, sStatusText, (width() - _vm->_font->getWidth(sStatusText)) / 2, 142, 0);
 	}
 
 	//***DEBUG***
@@ -476,16 +474,22 @@
 
 void MadsAction::clear() {
 	_actionMode = ACTMODE_NONE;
+	_actionMode2 = ACTMODE2_0;
+	_word_86F42 = 0;
+	_word_86F4E = 0;
 	_articleNumber = 0;
 	_lookFlag = false;
+	_word_86F4A = 0;
 	_statusText[0] = '\0';
 	_selectedRow = -1;
 	_currentHotspot = -1;
+	_word_86F3A = -1;
+	_word_86F4C = -1;
 	//word_86F3A/word_86F4C
 	_currentAction = kVerbNone;
 	_objectNameId = -1;
 	_objectDescId = -1;
-	//word_83334
+	_word_83334 = -1;
 }
 
 void MadsAction::appendVocab(int vocabId, bool capitalise) {
@@ -499,6 +503,7 @@
 }
 
 void MadsAction::set() {
+	int hotspotCount = _madsVm->scene()->getSceneResources().hotspotCount;
 	bool flag = false;
 	_currentAction = -1;
 	_objectNameId = -1;
@@ -562,14 +567,13 @@
 			if (_currentHotspot >= 0) {
 				if (_selectedRow < 0) {
 					int verbId;
-					int hotspotCount = _madsVm->scene()->getSceneResources().hotspotCount;
 
 					if (_currentHotspot < hotspotCount) {
 						// Get the verb Id from the hotspot
 						verbId = (*_madsVm->scene()->getSceneResources().hotspots)[_currentHotspot].getVerbID();
 					} else {
 						// Get the verb Id from the scene object
-						verbId = 0;//Scene_object[_currentHotspot - _hotspotCount].verbId;
+						verbId = (*_madsVm->scene()->getSceneResources().props)[_currentHotspot - hotspotCount].getVerbID();
 					}
 
 					if (verbId > 0) {
@@ -583,12 +587,58 @@
 					}
 				}
 
-				//loc_21CE2
+				if ((_actionMode2 == ACTMODE2_2) || (_actionMode2 == ACTMODE2_5)) {
+					// Get name from given inventory object
+					int objectId = _madsVm->scene()->getInterface()->getInventoryObject(_currentHotspot);
+					_objectNameId = _madsVm->globals()->getObject(objectId)->descId;
+				} else if (_currentHotspot < hotspotCount) {
+					// Get name from scene hotspot
+					_objectNameId = (*_madsVm->scene()->getSceneResources().hotspots)[_currentHotspot].getVocabID();
+				} else {
+					// Get name from temporary scene hotspot
+					_objectNameId = (*_madsVm->scene()->getSceneResources().props)[_currentHotspot].getVocabID();
+				}
 			}
 		}
+
+		if ((_currentHotspot >= 0) && (_articleNumber > 0) && !flag) {
+			if (_articleNumber == -1) {
+				if (_word_86F3A >= 0) {
+					int articleNum = 0;
+
+					if ((_word_86F42 == 2) || (_word_86F42 == 5)) {
+						int objectId = _madsVm->scene()->getInterface()->getInventoryObject(_currentHotspot);
+						articleNum = _madsVm->globals()->getObject(objectId)->article;
+					} else if (_word_86F3A < hotspotCount) {
+						articleNum = (*_madsVm->scene()->getSceneResources().hotspots)[_currentHotspot].getArticle();
+					} else {
+
+					}
+				}
+
+			} else if ((_articleNumber == kVerbLook) || (_vm->getGameType() != GType_RexNebular) ||
+				(strcmp(_madsVm->globals()->getVocab(_objectDescId), fenceStr) != 0)) {
+				// Write out the article
+				strcat(_statusText, englishMADSArticleList[_articleNumber]);
+			} else {
+				// Special case for a 'fence' entry in Rex Nebular
+				strcat(_statusText, overStr);
+			}
+
+			strcat(_statusText, " ");
+		}
+
+		// Append object description if necessary
+		if (_word_86F3A >= 0)
+			appendVocab(_objectDescId);
+
+		// Remove any trailing space character
+		int statusLen = strlen(_statusText);
+		if ((statusLen > 0) && (_statusText[statusLen - 1] == ' '))
+			_statusText[statusLen - 1] = '\0';
 	}
 
-	//word_83334 = -1;
+	_word_83334 = -1;
 }
 
 /*--------------------------------------------------------------------------*/

Modified: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	2010-03-15 22:24:52 UTC (rev 48265)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-03-16 08:26:08 UTC (rev 48266)
@@ -124,26 +124,38 @@
 };
 
 enum MadsActionMode {ACTMODE_NONE = 0, ACTMODE_VERB = 1, ACTMODE_OBJECT = 3, ACTMODE_TALK = 6};
+enum MAdsActionMode2 {ACTMODE2_0 = 0, ACTMODE2_2 = 2, ACTMODE2_5 = 5};
 
 class MadsAction {
 private:
 	char _statusText[100];
+
+	void appendVocab(int vocabId, bool capitalise = false);
+public:
 	int _currentHotspot;
 	int _objectNameId;
 	int _objectDescId;
 	int _currentAction;
 	int8 _flags1, _flags2;
 	MadsActionMode _actionMode;
+	MAdsActionMode2 _actionMode2;
 	int _articleNumber;
 	bool _lookFlag;
 	int _selectedRow;
+	// Unknown fields
+	int16 _word_86F3A;
+	int16 _word_86F42;
+	int16 _word_86F4E;
+	int16 _word_86F4A;
+	int16 _word_83334;
+	int16 _word_86F4C;
 
-	void appendVocab(int vocabId, bool capitalise = false);
 public:
 	MadsAction();
 
 	void clear();
 	void set();
+	const char *statusText() const { return _statusText; }
 };
 
 typedef Common::Array<SpriteAsset *> SpriteAssetArray;
@@ -155,7 +167,7 @@
 private:
 	MadsEngine *_vm;
 	MadsSceneResources _sceneResources;
-	char _statusText[100];
+	MadsAction _action;
 
 	MadsSceneLogic _sceneLogic;
 	SpriteAsset *_playerSprites;
@@ -187,7 +199,6 @@
 	virtual void leftClick(int x, int y);
 	virtual void rightClick(int x, int y);
 	virtual void setAction(int action, int objectId = -1);
-	virtual void setStatusText(const char *text);
 	virtual void update();
 
 	int loadSceneSpriteSet(const char *setName);
@@ -196,6 +207,7 @@
 
 	MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; };
 	MadsSceneResources &getSceneResources() { return _sceneResources; };
+	void setStatusText(const char *text) {};//***DEPRECATED***
 };
 
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-03-15 22:24:52 UTC (rev 48265)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-03-16 08:26:08 UTC (rev 48266)
@@ -77,6 +77,7 @@
 	virtual void setSelectedObject(int objectNumber);
 	virtual void addObjectToInventory(int objectNumber);
 	int getSelectedObject() { return _selectedObject; }
+	int getInventoryObject(int objectIndex) { return _inventoryList[objectIndex]; }
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
 	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-03-15 22:24:52 UTC (rev 48265)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-03-16 08:26:08 UTC (rev 48266)
@@ -44,7 +44,6 @@
 	_screenType = VIEWID_SCENE;
 
 	_sceneResources->hotspots = new HotSpotList();
-	_sceneResources->parallax = new HotSpotList();
 	_sceneResources->props = new HotSpotList();
 	_backgroundSurface = new M4Surface();
 	_walkSurface = new M4Surface();
@@ -124,22 +123,17 @@
 void Scene::showHotSpots() {
 	int i = 0;
 	HotSpot *currentHotSpot;
+
 	// hotspots (green)
 	for (i = 0; i < _sceneResources->hotspotCount; i++) {
 		currentHotSpot = _sceneResources->hotspots->get(i);
 		_backgroundSurface->frameRect(currentHotSpot->getRect(), _vm->_palette->GREEN);
 	}
-	if (_vm->isM4()) {
-		// parallax (yellow)
-		for (i = 0; i < _sceneResources->parallaxCount; i++) {
-			currentHotSpot = _sceneResources->parallax->get(i);
-			_backgroundSurface->frameRect(currentHotSpot->getRect(), _vm->_palette->YELLOW);
-		}
-		// props (red)
-		for (i = 0; i < _sceneResources->propsCount; i++) {
-			currentHotSpot = _sceneResources->props->get(i);
-			_backgroundSurface->frameRect(currentHotSpot->getRect(), _vm->_palette->RED);
-		}
+
+	// props (red)
+	for (i = 0; i < _sceneResources->propsCount; i++) {
+		currentHotSpot = _sceneResources->props->get(i);
+		_backgroundSurface->frameRect(currentHotSpot->getRect(), _vm->_palette->RED);
 	}
 }
 

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-03-15 22:24:52 UTC (rev 48265)
+++ scummvm/trunk/engines/m4/scene.h	2010-03-16 08:26:08 UTC (rev 48266)
@@ -64,8 +64,6 @@
 	char pictureBase[MAX_CHK_FILENAME_SIZE];
 	int32 hotspotCount;
 	HotSpotList *hotspots;
-	int32 parallaxCount;
-	HotSpotList *parallax;
 	int32 propsCount;
 	HotSpotList *props;
 	int32 frontY, backY;
@@ -103,13 +101,12 @@
 	virtual void leftClick(int x, int y) = 0;
 	virtual void rightClick(int x, int y) = 0;
 	virtual void setAction(int action, int objectId = -1) = 0;
-	virtual void setStatusText(const char *text) = 0;
 	virtual void update() = 0;
+	virtual void showHotSpots();
 
 	// TODO: perhaps move playIntro() someplace else?
 	void playIntro();
 	void showSprites();
-	void showHotSpots();
 	void showCodes();
 	int getCurrentScene() { return _currentScene; }
 	M4Surface *getBackgroundSurface() const { return _backgroundSurface; }

Modified: scummvm/trunk/engines/m4/staticres.cpp
===================================================================
--- scummvm/trunk/engines/m4/staticres.cpp	2010-03-15 22:24:52 UTC (rev 48265)
+++ scummvm/trunk/engines/m4/staticres.cpp	2010-03-16 08:26:08 UTC (rev 48266)
@@ -42,6 +42,8 @@
 const char *toStr = "to ";
 const char *useStr = "Use ";
 const char *walkToStr = "Walk to ";
+const char *fenceStr = "fence";
+const char *overStr = "over";
 
 VerbInit verbList[10] = {
 	{kVerbLook, 2, 0},

Modified: scummvm/trunk/engines/m4/staticres.h
===================================================================
--- scummvm/trunk/engines/m4/staticres.h	2010-03-15 22:24:52 UTC (rev 48265)
+++ scummvm/trunk/engines/m4/staticres.h	2010-03-16 08:26:08 UTC (rev 48266)
@@ -40,6 +40,8 @@
 extern const char *toStr;
 extern const char *useStr;
 extern const char *walkToStr;
+extern const char *fenceStr;
+extern const char *overStr;
 
 struct VerbInit {
 	int verb;


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

Revision: 48298
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48298&view=rev
Author:   dreammaster
Date:     2010-03-19 09:19:23 +0000 (Fri, 19 Mar 2010)

Log Message:
-----------
Beginnings of hooking up the new logic for current action display

Modified Paths:
--------------
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/globals.cpp
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/m4_scene.h
    scummvm/trunk/engines/m4/mads_scene.h
    scummvm/trunk/engines/m4/mads_views.cpp
    scummvm/trunk/engines/m4/scene.h

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2010-03-19 02:49:13 UTC (rev 48297)
+++ scummvm/trunk/engines/m4/console.cpp	2010-03-19 09:19:23 UTC (rev 48298)
@@ -330,8 +330,8 @@
 				DebugPrintf(" - ");
 				for (int i = 0; i < obj->vocabCount; ++i) {
 					if (i != 0) DebugPrintf(", ");
-					DebugPrintf("%s (%d)/%d", _vm->globals()->getVocab(obj->vocabList[i].vocabId),
-						obj->vocabList[i].vocabId, obj->vocabList[i].unk);
+					DebugPrintf("%s (%d)/%d,%d", _vm->globals()->getVocab(obj->vocabList[i].vocabId),
+						obj->vocabList[i].vocabId, obj->vocabList[i].flags1, obj->vocabList[i].flags2);
 				}
 			}
 			DebugPrintf("\n");

Modified: scummvm/trunk/engines/m4/globals.cpp
===================================================================
--- scummvm/trunk/engines/m4/globals.cpp	2010-03-19 02:49:13 UTC (rev 48297)
+++ scummvm/trunk/engines/m4/globals.cpp	2010-03-19 09:19:23 UTC (rev 48298)
@@ -527,7 +527,8 @@
 	assert(vocabCount <= 3);
 
 	for (int i = 0; i < vocabCount; ++i) {
-		vocabList[i].unk = READ_LE_UINT16(&obj[6 + i * 4]);
+		vocabList[i].flags1 = obj[6 + i * 4];
+		vocabList[i].flags2 = obj[7 + i * 4];
 		vocabList[i].vocabId = READ_LE_UINT16(&obj[8 + i * 4]);
 	}
 }

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2010-03-19 02:49:13 UTC (rev 48297)
+++ scummvm/trunk/engines/m4/globals.h	2010-03-19 09:19:23 UTC (rev 48298)
@@ -166,7 +166,8 @@
 };
 
 struct VocabEntry {
-	uint16 unk;
+	uint8 flags1;
+	uint8 flags2;
 	uint16 vocabId;
 };
 

Modified: scummvm/trunk/engines/m4/m4_scene.h
===================================================================
--- scummvm/trunk/engines/m4/m4_scene.h	2010-03-19 02:49:13 UTC (rev 48297)
+++ scummvm/trunk/engines/m4/m4_scene.h	2010-03-19 09:19:23 UTC (rev 48298)
@@ -72,7 +72,6 @@
 	virtual void checkHotspotAtMousePos(int x, int y);
 	virtual void leftClick(int x, int y);
 	virtual void rightClick(int x, int y);
-	virtual void setAction(int action, int objectId = -1);
 	virtual void update();
 	virtual void showHotSpots();
 
@@ -80,6 +79,7 @@
 	M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; };
 	M4SceneResources &getSceneResources() { return _sceneResources; };
 	void setStatusText(const char *text);
+	void setAction(int action, int objectId = -1);
 };
 
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	2010-03-19 02:49:13 UTC (rev 48297)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-03-19 09:19:23 UTC (rev 48298)
@@ -207,6 +207,7 @@
 
 	MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; };
 	MadsSceneResources &getSceneResources() { return _sceneResources; };
+	MadsAction &getAction() { return _action; }
 	void setStatusText(const char *text) {};//***DEPRECATED***
 };
 

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-03-19 02:49:13 UTC (rev 48297)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-03-19 09:19:23 UTC (rev 48298)
@@ -249,6 +249,8 @@
 }
 
 bool MadsInterfaceView::onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents) {
+	MadsAction &act = _madsVm->scene()->getAction();
+
 	// If the mouse isn't being held down, then reset the repeated scroll timer
 	if (eventType != MEVENT_LEFT_HOLD)
 		_nextScrollerTicks = 0;
@@ -270,25 +272,35 @@
 
 	case MEVENT_LEFT_CLICK:
 		// Left mouse click
-		// Check if an inventory object was selected
-		if ((_highlightedElement >= INVLIST_START) && (_highlightedElement < (INVLIST_START + 5))) {
-			// Ensure there is an inventory item listed in that cell
-			uint idx = _highlightedElement - INVLIST_START;
-			if ((_topIndex + idx) < _inventoryList.size()) {
-				// Set the selected object
-				setSelectedObject(_inventoryList[_topIndex + idx]);
+		{
+			// Check if an inventory object was selected
+			if ((_highlightedElement >= INVLIST_START) && (_highlightedElement < (INVLIST_START + 5))) {
+				// Ensure there is an inventory item listed in that cell
+				uint idx = _highlightedElement - INVLIST_START;
+				if ((_topIndex + idx) < _inventoryList.size()) {
+					// Set the selected object
+					setSelectedObject(_inventoryList[_topIndex + idx]);
+				}
+			} else if ((_highlightedElement >= ACTIONS_START) && (_highlightedElement < (ACTIONS_START + 10))) {
+				// A standard action was selected
+				int verbId = kVerbLook + (_highlightedElement - ACTIONS_START);
+				warning("Selected action #%d", verbId);
+				
+			} else if ((_highlightedElement >= VOCAB_START) && (_highlightedElement < (VOCAB_START + 5))) {
+				// A vocab action was selected
+				MadsObject *obj = _madsVm->globals()->getObject(_selectedObject);
+				int vocabIndex = MIN(_highlightedElement - VOCAB_START, obj->vocabCount - 1);
+				if (vocabIndex >= 0) {
+					act._actionMode = ACTMODE_OBJECT;
+					act._actionMode2 = ACTMODE2_2;
+					act._flags1 = obj->vocabList[1].flags1;
+					act._flags2 = obj->vocabList[1].flags2;
+
+					act._currentHotspot = _selectedObject;
+					act._articleNumber = act._flags2;
+				}
 			}
-		} else if ((_highlightedElement >= ACTIONS_START) && (_highlightedElement < (ACTIONS_START + 10))) {
-			// A standard action was selected
-			_vm->_scene->setAction(kVerbLook + (_highlightedElement - ACTIONS_START));
-		} else if ((_highlightedElement >= VOCAB_START) && (_highlightedElement < (VOCAB_START + 5))) {
-			// A vocab action was selected
-			MadsObject *obj = _madsVm->globals()->getObject(_selectedObject);
-			int vocabIndex = MIN(_highlightedElement - VOCAB_START, obj->vocabCount - 1);
-			if (vocabIndex >= 0)
-				_vm->_scene->setAction(obj->vocabList[vocabIndex].vocabId, _selectedObject);
 		}
-
 		return true;
 
 	case MEVENT_LEFT_HOLD:

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-03-19 02:49:13 UTC (rev 48297)
+++ scummvm/trunk/engines/m4/scene.h	2010-03-19 09:19:23 UTC (rev 48298)
@@ -100,7 +100,6 @@
 	virtual void checkHotspotAtMousePos(int x, int y) = 0;
 	virtual void leftClick(int x, int y) = 0;
 	virtual void rightClick(int x, int y) = 0;
-	virtual void setAction(int action, int objectId = -1) = 0;
 	virtual void update() = 0;
 	virtual void showHotSpots();
 


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

Revision: 48368
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48368&view=rev
Author:   dreammaster
Date:     2010-03-23 12:02:23 +0000 (Tue, 23 Mar 2010)

Log Message:
-----------
Added further code for the game dialog framework

Modified Paths:
--------------
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/mads_menus.h
    scummvm/trunk/engines/m4/mads_scene.cpp
    scummvm/trunk/engines/m4/mads_scene.h
    scummvm/trunk/engines/m4/viewmgr.cpp
    scummvm/trunk/engines/m4/viewmgr.h

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-03-23 08:33:51 UTC (rev 48367)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-03-23 12:02:23 UTC (rev 48368)
@@ -586,22 +586,32 @@
  *--------------------------------------------------------------------------
  */
 
-RexDialogView::RexDialogView(): View(_madsVm, Common::Rect(0, 0, _madsVm->_screen->width(), _madsVm->_screen->height())) {
+RexDialogView::RexDialogView(): MadsView(_madsVm, Common::Rect(0, 0, _madsVm->_screen->width(), _madsVm->_screen->height())) {
 	_screenType = VIEWID_MENU;
-	_initialised = false;
 
+	// Store the previously active scene
+	_priorSceneId = _madsVm->_scene->getCurrentScene();
+
+	// Load necessary quotes
+	_madsVm->globals()->loadQuoteRange(1, 48);
+
+	initialiseLines();
+	initialiseGraphics();
+}
+
+void RexDialogView::initialiseLines() {
 	// Set up a list of blank entries for use in the various dialogs
 	for (int i = 0; i < DIALOG_LINES_SIZE; ++i) {
 		DialogTextEntry rec;
+		rec.in_use = false;
 		_dialogText.push_back(rec);
 	}
 	_totalTextEntries = 0;
 
-	// Store the previously active scene
-	_priorSceneId = _madsVm->_scene->getCurrentScene();
-
-	// Load necessary quotes
-	_madsVm->globals()->loadQuoteRange(1, 48);
+	// Set up a default sprite slot entry
+	_spriteSlotsStart = 1;
+	_spriteSlots[0].spriteId = -2;
+	_spriteSlots[0].timerIndex = -1;
 }
 
 void RexDialogView::initialiseGraphics() {
@@ -620,20 +630,16 @@
 
 	// Set the current cursor
 	_madsVm->_mouse->setCursorNum(CURSOR_ARROW);
-
-	_initialised = true;
 }
 
 
 RexDialogView::~RexDialogView() {
-	if (_initialised) {
-		_madsVm->_palette->deleteRange(_bgPalData);
-		delete _bgPalData;
-		delete _backgroundSurface;
-		_madsVm->_palette->deleteRange(_spritesPalData);
-		delete _spritesPalData;
-		delete _menuSprites;
-	}
+	_madsVm->_palette->deleteRange(_bgPalData);
+	delete _bgPalData;
+	delete _backgroundSurface;
+	_madsVm->_palette->deleteRange(_spritesPalData);
+	delete _spritesPalData;
+	delete _menuSprites;
 }
 
 void RexDialogView::loadBackground() {
@@ -683,9 +689,6 @@
 
 
 void RexDialogView::updateState() {
-	if (!_initialised) {
-		initialiseGraphics();
-	}
 }
 
 void RexDialogView::onRefresh(RectList *rects, M4Surface *destSurface) {
@@ -701,11 +704,147 @@
 	View::onRefresh(rects, destSurface);
 }
 
+void RexDialogView::setFrame(int frameNumber, int depth) {
+	int slotIndex = getSpriteSlotsIndex();
+	_spriteSlots[slotIndex].spriteId = 1;
+	_spriteSlots[slotIndex].timerIndex = 1;
+	_spriteSlots[slotIndex].spriteListIndex = 0; //_menuSpritesIndex;
+	_spriteSlots[slotIndex].frameNumber = frameNumber;
+	M4Sprite *spr = _menuSprites->getFrame(0);
+	_spriteSlots[slotIndex].width = spr->width();
+	_spriteSlots[slotIndex].height = spr->height();
+	_spriteSlots[slotIndex].depth = depth;
+	_spriteSlots[slotIndex].scale = 100;
+}
+
+void RexDialogView::initVars() {
+	_word_8502C = -1;
+	_selectedLine = -1;
+	_lineIndex = 0;
+	_enterFlag = false;
+	_textLines.clear();
+}
+
+void RexDialogView::addLine(const char *msg_p, Font *font, MadsTextAlignment alignment, int left, int top) {
+	DialogTextEntry *rec = NULL;
+
+	if (_lineIndex < _totalTextEntries) {
+		if (strcmp(msg_p, _dialogText[_lineIndex].text) == 0)  {
+			rec = &_dialogText[_lineIndex];
+			if (rec->textDisplay_index != 0) {
+				MadsTextDisplayEntry &tdEntry = _textDisplay[rec->textDisplay_index];
+				if (tdEntry.active) {
+					if (_textLines.size() < 20) {
+						// Add entry to line list
+						_textLines.push_back(tdEntry.msg);
+						tdEntry.msg = _textLines[_textLines.size() - 1].c_str();
+					}
+				}
+			}
+		}
+	} else {
+		if (_lineIndex < DIALOG_LINES_SIZE) {
+			rec = &_dialogText[_lineIndex];
+			_totalTextEntries = _lineIndex + 1;
+		}
+	}
+
+	// Handling for if a line needs to be added
+	if (rec) {
+		strcpy(rec->text, msg_p);
+		rec->font = font;
+		rec->field_2 = 0;
+		rec->pos.y = top;
+		rec->widthAdjust = -1;
+		rec->in_use = true;
+		rec->textDisplay_index = -1;
+
+		switch (alignment) {
+		case ALIGN_CENTER:
+			// Center text
+			rec->pos.x = (width() - font->getWidth(rec->text)) / 2;
+			break;
+
+		case ALIGN_CHAR_CENTER: {
+			// Text is center aligned on the '@' character within the string
+			char *p = strchr(rec->text, '@');
+
+			if (p) {
+				// '@' string handling
+				// Get length of string up to the '@' character
+				*p = '\0';
+				int strWidth = font->getWidth(rec->text, rec->widthAdjust);
+				// Remove the character from the string. strcpy isn't used here because it's unsafe for
+				// copying within the same string
+				while ((*p == *(p + 1)) != '\0') ++p;
+
+				rec->pos.x = (width() / 2) - strWidth;
+			} else {
+				rec->pos.x = left;
+			}
+			break;
+		}
+	
+		case RIGHT_ALIGN:
+			// Right align (moving left from given passed left)
+			rec->pos.x = left - font->getWidth(rec->text);
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	++_lineIndex;
+}
+
+/**
+ * Adds a line consisting of either a single quote, or the combination of two quote Ids
+ */
+void RexDialogView::addQuote(Font *font, MadsTextAlignment alignment, int left, int top, int id1, int id2) {
+	char buffer[80];
+
+	// Copy the first quote string into the buffer
+	const char *quoteStr = _madsVm->globals()->getQuote(id1);
+	strcpy(buffer, quoteStr);
+
+	// Handle the optional second quote Id
+	if (id2 != 0) {
+		quoteStr = _madsVm->globals()->getQuote(id2);
+		strcat(buffer, " ");
+		strcat(buffer, quoteStr);
+	}
+
+	// Add in the generated line
+	addLine(buffer, font, alignment, left, top);
+}
+
 /*--------------------------------------------------------------------------
  * RexDialogView is the Rex Nebular Game Menu dialog
  *--------------------------------------------------------------------------
  */
 
+RexGameMenuDialog::RexGameMenuDialog(): RexDialogView() {
+	setFrame(1, 2);
+	initVars();
+
+	_vm->_font->setFont(FONT_CONVERSATION_MADS);
+	addLines();
+}
+
+void RexGameMenuDialog::addLines() {
+	// Add the title
+	int top = -((_vm->_font->getHeight() + 1) * 12 - 78);
+	addQuote(_vm->_font, ALIGN_CENTER, 0, top, 10);
+
+	// Loop for adding the option lines of the dialog
+	top += 6;
+	for (int idx = 0; idx < 5; ++idx) {
+		top += _vm->_font->getHeight() + 1;
+		addQuote(_vm->_font, ALIGN_CENTER, 0, top, 11 + idx);
+	}
+}
+
 void RexGameMenuDialog::onRefresh(RectList *rects, M4Surface *destSurface) {
 	RexDialogView::onRefresh(rects, destSurface);
 }

Modified: scummvm/trunk/engines/m4/mads_menus.h
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.h	2010-03-23 08:33:51 UTC (rev 48367)
+++ scummvm/trunk/engines/m4/mads_menus.h	2010-03-23 12:02:23 UTC (rev 48368)
@@ -104,15 +104,29 @@
 
 #define DIALOG_LINES_SIZE 20
 
-class RexDialogView: public View {
+enum MadsTextAlignment { ALIGN_CENTER = -1, ALIGN_CHAR_CENTER = -2, RIGHT_ALIGN = -3 };
+
+
+class RexDialogView: public MadsView {
 private:
 	int _priorSceneId;
-	bool _initialised;
 
+	void initialiseLines();
 	void initialiseGraphics();
 	void loadBackground();
 	void loadMenuSprites();
 protected:
+	int _word_8502C;
+	int _selectedLine;
+	int _lineIndex;
+	bool _enterFlag;
+	Common::StringArray _textLines;
+
+	void setFrame(int frameNumber, int depth);
+	void initVars();
+	void addLine(const char *msg_p, Font *font, MadsTextAlignment alignment, int left, int top);
+	void addQuote(Font *font, MadsTextAlignment alignment, int left, int top, int id1, int id2 = 0);
+protected:
 	M4Surface *_backgroundSurface;
 	RGBList *_bgPalData;
 	SpriteAsset *_menuSprites;
@@ -131,8 +145,10 @@
 };
 
 class RexGameMenuDialog: public RexDialogView {
+private:
+	void addLines();
 public:
-	RexGameMenuDialog(): RexDialogView() {};
+	RexGameMenuDialog();
 
 	virtual void onRefresh(RectList *rects, M4Surface *destSurface);
 };

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-03-23 08:33:51 UTC (rev 48367)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-03-23 12:02:23 UTC (rev 48368)
@@ -688,7 +688,7 @@
 /*--------------------------------------------------------------------------*/
 
 MadsScreenText::MadsScreenText() {
-	for (int i = 0; i < TEXT_DISPLAY_SIZE; ++i)
+	for (int i = 0; i < OLD_TEXT_DISPLAY_SIZE; ++i)
 		_textDisplay[i].active = false;
 	for (int i = 0; i < TIMED_TEXT_SIZE; ++i)
 		_timedText[i].flags = 0;
@@ -701,9 +701,9 @@
 int MadsScreenText::add(const Common::Point &destPos, uint fontColours, int widthAdjust, const char *msg, Font *font) {
 	// Find a free slot
 	int idx = 0;
-	while ((idx < TEXT_DISPLAY_SIZE) && _textDisplay[idx].active)
+	while ((idx < OLD_TEXT_DISPLAY_SIZE) && _textDisplay[idx].active)
 		++idx;
-	if (idx == TEXT_DISPLAY_SIZE)
+	if (idx == OLD_TEXT_DISPLAY_SIZE)
 		error("Ran out of text display slots");
 
 	// Set up the entry values
@@ -766,27 +766,10 @@
  * Draws any text display entries to the screen
  */
 void MadsScreenText::draw(M4Surface *surface) {
-	for (int idx = 0; idx < TEXT_DISPLAY_SIZE; ++idx) {
-		if (_textDisplay[idx].active && (_textDisplay[idx].active2 >= 0)) {
-			_textDisplay[idx].font->setColours(_textDisplay[idx].colour1, 0xFF,
-				(_textDisplay[idx].colour2 == 0) ? _textDisplay[idx].colour1 : _textDisplay[idx].colour2);
-			_textDisplay[idx].font->writeString(surface, _textDisplay[idx].message, 
-				_textDisplay[idx].bounds.left, _textDisplay[idx].bounds.top, _textDisplay[idx].bounds.width(),
-				_textDisplay[idx].spacing);
-		}
-	}
-
-	// Clear up any now inactive text display entries
-	for (int idx = 0; idx < TEXT_DISPLAY_SIZE; ++idx) {
-		if (_textDisplay[idx].active2 < 0) {
-			_textDisplay[idx].active = false;
-			_textDisplay[idx].active2 = 0;
-		}
-	}
 }
 
 void MadsScreenText::timedDisplay() {
-	for (int idx = 0; !_abortTimedText && (idx < TEXT_DISPLAY_SIZE); ++idx) {
+	for (int idx = 0; !_abortTimedText && (idx < OLD_TEXT_DISPLAY_SIZE); ++idx) {
 		if (((_timedText[idx].flags & TEXTFLAG_ACTIVE) != 0) && 
 			(_timedText[idx].frameTimer <= g_system->getMillis()))
 			// Add the specified entry

Modified: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	2010-03-23 08:33:51 UTC (rev 48367)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-03-23 12:02:23 UTC (rev 48368)
@@ -66,7 +66,7 @@
 };
 
 #define TIMED_TEXT_SIZE 10
-#define TEXT_DISPLAY_SIZE 40
+#define OLD_TEXT_DISPLAY_SIZE 40
 #define TEXT_4A_SIZE 30
 
 enum TalkTextFlags {TEXTFLAG_2 = 2, TEXTFLAG_4 = 4, TEXTFLAG_8 = 8, TEXTFLAG_40 = 0x40,
@@ -104,7 +104,7 @@
 
 class MadsScreenText {
 private:
-	TextDisplay _textDisplay[TEXT_DISPLAY_SIZE];
+	TextDisplay _textDisplay[OLD_TEXT_DISPLAY_SIZE];
 	TimedText _timedText[TIMED_TEXT_SIZE];
 	Text4A _text4A[TEXT_4A_SIZE];
 	bool _abortTimedText;

Modified: scummvm/trunk/engines/m4/viewmgr.cpp
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.cpp	2010-03-23 08:33:51 UTC (rev 48367)
+++ scummvm/trunk/engines/m4/viewmgr.cpp	2010-03-23 12:02:23 UTC (rev 48368)
@@ -194,6 +194,72 @@
 
 //--------------------------------------------------------------------------
 
+MadsTextDisplay::MadsTextDisplay() {
+	for (int i = 0; i < TEXT_DISPLAY_SIZE; ++i)
+		_entries[i].active = false;
+}
+
+int MadsTextDisplay::add(int xp, int yp, uint fontColour, int charSpacing, const char *msg, Font *font) {
+	int usedSlot = -1;
+
+	for (int idx = 0; idx < TEXT_DISPLAY_SIZE; ++idx) {
+		if (!_entries[idx].active) {
+			usedSlot = idx;
+
+			_entries[idx].bounds.left = xp;
+			_entries[idx].bounds.top = yp;
+			_entries[idx].font = font;
+			_entries[idx].msg = msg;
+			_entries[idx].bounds.setWidth(font->getWidth(msg, charSpacing));
+			_entries[idx].bounds.setHeight(font->getHeight());
+			_entries[idx].colour1 = fontColour & 0xff;
+			_entries[idx].colour2 = fontColour >> 8;
+			_entries[idx].spacing = charSpacing;
+			_entries[idx].active2 = 1;
+			_entries[idx].active = true;
+			break;
+		}
+	}
+
+	return usedSlot;
+}
+
+void MadsTextDisplay::draw(View *view) {
+	for (int idx = 0; idx < OLD_TEXT_DISPLAY_SIZE; ++idx) {
+		if (_entries[idx].active && (_entries[idx].active2 >= 0)) {
+			_entries[idx].font->setColours(_entries[idx].colour1, 0xFF,
+				(_entries[idx].colour2 == 0) ? _entries[idx].colour1 : _entries[idx].colour2);
+			_entries[idx].font->writeString(view, _entries[idx].msg, 
+				_entries[idx].bounds.left, _entries[idx].bounds.top, _entries[idx].bounds.width(),
+				_entries[idx].spacing);
+		}
+	}
+
+	// Clear up any now inactive text display entries
+	for (int idx = 0; idx < OLD_TEXT_DISPLAY_SIZE; ++idx) {
+		if (_entries[idx].active2 < 0) {
+			_entries[idx].active = false;
+			_entries[idx].active2 = 0;
+		}
+	}
+}
+
+//--------------------------------------------------------------------------
+
+MadsView::MadsView(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent): View(vm, viewBounds, transparent) {
+	_spriteSlotsStart = 0;
+}
+
+MadsView::MadsView(MadsM4Engine *vm, int x, int y, bool transparent): View(vm, x, y, transparent) {
+	_spriteSlotsStart = 0;
+}
+
+int MadsView::getSpriteSlotsIndex() {
+	return _spriteSlotsStart++;
+}
+
+//--------------------------------------------------------------------------
+
 ViewManager::ViewManager(MadsM4Engine *vm): _systemHotkeys(HotkeyList(NULL)), _vm(vm) {
 	_captureScreen = NULL;
 	_captureEvents = false;

Modified: scummvm/trunk/engines/m4/viewmgr.h
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.h	2010-03-23 08:33:51 UTC (rev 48367)
+++ scummvm/trunk/engines/m4/viewmgr.h	2010-03-23 12:02:23 UTC (rev 48368)
@@ -32,6 +32,7 @@
 #include "common/events.h"
 #include "common/rect.h"
 
+#include "m4/font.h"
 #include "m4/globals.h"
 #include "m4/events.h"
 #include "m4/graphics.h"
@@ -147,6 +148,71 @@
 	bool _transparent;
 };
 
+class MadsSpriteSlot {
+public:
+	int spriteId;
+	int timerIndex;
+	int spriteListIndex;
+	int frameNumber;
+	int width;
+	int height;
+	int depth;
+	int scale;
+
+	MadsSpriteSlot() { };
+};
+
+#define SPRITE_SLOTS_SIZE 50
+
+class MadsTextDisplayEntry {
+public:
+	bool active;
+	int spacing;
+	Common::Rect bounds;
+	int active2;
+	uint8 colour1;
+	uint8 colour2;
+	Font *font;
+	const char *msg;
+
+	MadsTextDisplayEntry() { active = false; }
+};
+
+#define TEXT_DISPLAY_SIZE 40
+
+class MadsTextDisplay {
+private:
+	MadsTextDisplayEntry _entries[TEXT_DISPLAY_SIZE];
+public:
+	MadsTextDisplay();
+
+	MadsTextDisplayEntry &operator[](int idx) {
+		assert(idx < TEXT_DISPLAY_SIZE);
+		return _entries[idx];
+	}
+
+	int setActive2(int idx) {
+		assert(idx < TEXT_DISPLAY_SIZE);
+		_entries[idx].active2 = -1;
+	}
+
+	int add(int xp, int yp, uint fontColour, int charSpacing, const char *msg, Font *font);
+	void draw(View *view);
+};
+
+class MadsView: public View {
+protected:
+	MadsSpriteSlot _spriteSlots[SPRITE_SLOTS_SIZE];
+	MadsTextDisplay _textDisplay;
+	int _spriteSlotsStart;
+
+	int getSpriteSlotsIndex();
+public:
+	MadsView(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent = false);
+	MadsView(MadsM4Engine *vm, int x = 0, int y = 0, bool transparent = false);
+
+};
+
 class ViewManager {
 private:
 	MadsM4Engine *_vm;


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

Revision: 48378
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48378&view=rev
Author:   dreammaster
Date:     2010-03-24 11:49:26 +0000 (Wed, 24 Mar 2010)

Log Message:
-----------
Moved new MadsView related code into Mads_Views, where it's more appropriate. Added extra logic necessary for displaying text in the game dialogs

Modified Paths:
--------------
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/mads_menus.h
    scummvm/trunk/engines/m4/mads_views.cpp
    scummvm/trunk/engines/m4/mads_views.h
    scummvm/trunk/engines/m4/viewmgr.cpp
    scummvm/trunk/engines/m4/viewmgr.h

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-03-24 11:47:08 UTC (rev 48377)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-03-24 11:49:26 UTC (rev 48378)
@@ -701,7 +701,10 @@
 	// Add in the loaded background vertically centred
 	_backgroundSurface->copyTo(this, 0, (height() - MADS_SURFACE_HEIGHT) / 2);
 
-	View::onRefresh(rects, destSurface);
+	// Check whether any of the dialog text entries need to be refreshed
+	refreshText();
+
+	MadsView::onRefresh(rects, destSurface);
 }
 
 void RexDialogView::setFrame(int frameNumber, int depth) {
@@ -753,7 +756,7 @@
 	if (rec) {
 		strcpy(rec->text, msg_p);
 		rec->font = font;
-		rec->field_2 = 0;
+		rec->state = 0;
 		rec->pos.y = top;
 		rec->widthAdjust = -1;
 		rec->in_use = true;
@@ -819,6 +822,65 @@
 	addLine(buffer, font, alignment, left, top);
 }
 
+/**
+ * Sets any previously created dialog text entries as clickable items
+ */
+void RexDialogView::setClickableLines() {
+	_screenObjects.clear();
+
+	for (int i = 0; i < DIALOG_LINES_SIZE; ++i) {
+		if (_dialogText[i].in_use) {
+			// Add an entry for the line
+			_screenObjects.add(Common::Rect(_dialogText[i].pos.x, _dialogText[i].pos.y, 
+				_dialogText[i].pos.x + _dialogText[i].font->getWidth(_dialogText[i].text, _dialogText[i].widthAdjust),
+				_dialogText[i].pos.y + _dialogText[i].font->getHeight()), 19, i, 1);
+		}
+	}
+
+	if ((_madsVm->globals()->dialogType == DIALOG_SAVE) || (_madsVm->globals()->dialogType == DIALOG_RESTORE)) {
+		// Extra entries for the scroller areas of the  Save and Restor dialogs
+		_screenObjects.add(Common::Rect(293, 26, 312, 75), LAYER_GUI, 50, 2);
+		_screenObjects.add(Common::Rect(293, 78, 312, 127), LAYER_GUI, 51, 2);
+	}
+}
+
+/**
+ * Handles creating text display objects for each dialog line initially, and when the selected state
+ * of any entry changes
+ */
+void RexDialogView::refreshText() {
+	for (uint i = 0; i < _dialogText.size(); ++i) {
+		if (!_dialogText[i].in_use)
+			continue;
+
+		// Get the item's colours
+		uint colour;
+		if (_dialogText[i].state == STATE_DESELECTED)
+			colour = 0xB0A;
+		else if (_dialogText[i].state == STATE_HIGHLIGHTED)
+			colour = 0xD0C;
+		else
+			colour = 0xF0E;
+
+		// If there's an associated text display entry, check to see if it's colour needs to change
+		if (_dialogText[i].textDisplay_index >= 0) {
+			MadsTextDisplayEntry &tdEntry = _textDisplay[_dialogText[i].textDisplay_index];
+
+			if ((tdEntry.colour1 == (colour & 0xff)) && (tdEntry.colour2 == (colour >> 8)))
+				// It's still the same, so no further action needed
+				continue;
+
+			// Flag the currently assigned text display to be expired, so it can be re-created
+			_textDisplay.expire(_dialogText[i].textDisplay_index);
+			_dialogText[i].textDisplay_index = -1;
+		}
+
+		// Create a new text display entry for the dialog text line
+		_dialogText[i].textDisplay_index = _textDisplay.add(_dialogText[i].pos.x, _dialogText[i].pos.y,
+			colour, _dialogText[i].widthAdjust, _dialogText[i].text, _dialogText[i].font);
+	}
+}
+
 /*--------------------------------------------------------------------------
  * RexDialogView is the Rex Nebular Game Menu dialog
  *--------------------------------------------------------------------------
@@ -830,11 +892,13 @@
 
 	_vm->_font->setFont(FONT_CONVERSATION_MADS);
 	addLines();
+	setClickableLines();
 }
 
 void RexGameMenuDialog::addLines() {
 	// Add the title
-	int top = -((_vm->_font->getHeight() + 1) * 12 - 78);
+	int top = (height() - MADS_SURFACE_HEIGHT) / 2 +  -((((_vm->_font->getHeight() + 2) * 6) >> 1) - 78);
+		
 	addQuote(_vm->_font, ALIGN_CENTER, 0, top, 10);
 
 	// Loop for adding the option lines of the dialog
@@ -849,4 +913,47 @@
 	RexDialogView::onRefresh(rects, destSurface);
 }
 
+bool RexGameMenuDialog::onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents) {
+	bool handled = false;
+
+	// Handle various event types
+	switch (eventType) {
+	case MEVENT_LEFT_CLICK:
+		// Left mouse click
+		// TODO: Check and figure out _selectedLine
+		handled = true;
+		break;
+
+	case KEVENT_KEY:
+		// Handle standard dialog keypresses
+
+		handled = true;
+		break;
+
+	default:
+		break;
+	}
+
+	if (_selectedLine > 0) {
+		switch (_selectedLine) {
+		case 1:
+			_madsVm->globals()->dialogType = DIALOG_SAVE;
+		case 2:
+			_madsVm->globals()->dialogType = DIALOG_RESTORE;
+		case 3:
+			_madsVm->globals()->dialogType = DIALOG_OPTIONS;
+		default:
+			// TODO: Extra logic for such as resuming scene if necessary
+			_madsVm->globals()->dialogType = DIALOG_NONE;
+			break;
+		}
+
+		// Close this dialog
+		_madsVm->_viewManager->deleteView(this);
+	}
+
+	return handled;
 }
+
+
+}

Modified: scummvm/trunk/engines/m4/mads_menus.h
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.h	2010-03-24 11:47:08 UTC (rev 48377)
+++ scummvm/trunk/engines/m4/mads_menus.h	2010-03-24 11:49:26 UTC (rev 48378)
@@ -28,6 +28,7 @@
 
 #include "common/str-array.h"
 #include "m4/viewmgr.h"
+#include "m4/mads_views.h"
 #include "m4/font.h"
 
 namespace M4 {
@@ -36,6 +37,8 @@
 
 enum MadsGameAction {START_GAME, RESUME_GAME, SHOW_INTRO, CREDITS, QUOTES, EXIT};
 
+enum MadsLayers {LAYER_GUI = 19};
+
 class RexMainMenuView : public View {
 private:
 	M4Surface *_bgSurface;
@@ -88,10 +91,12 @@
 	void updateState();
 };
 
+enum DialogTextState {STATE_DESELECTED = 0, STATE_HIGHLIGHTED = 1, STATE_SELECTED = 2};
+
 class DialogTextEntry {
 public:
 	bool in_use;
-	int16 field_2;
+	int state;
 	Common::Point pos;
 	char text[80];
 	Font *font;
@@ -116,26 +121,28 @@
 	void loadBackground();
 	void loadMenuSprites();
 protected:
+	M4Surface *_backgroundSurface;
+	RGBList *_bgPalData;
+	SpriteAsset *_menuSprites;
+	RGBList *_spritesPalData;
+
+	Common::Array<DialogTextEntry> _dialogText;
+	Common::StringArray _textLines;
+	int _totalTextEntries;
+	int _dialogSelectedLine;
+	Common::StringArray _saveList;
+
 	int _word_8502C;
 	int _selectedLine;
 	int _lineIndex;
 	bool _enterFlag;
-	Common::StringArray _textLines;
 
 	void setFrame(int frameNumber, int depth);
 	void initVars();
 	void addLine(const char *msg_p, Font *font, MadsTextAlignment alignment, int left, int top);
 	void addQuote(Font *font, MadsTextAlignment alignment, int left, int top, int id1, int id2 = 0);
-protected:
-	M4Surface *_backgroundSurface;
-	RGBList *_bgPalData;
-	SpriteAsset *_menuSprites;
-	RGBList *_spritesPalData;
-
-	Common::Array<DialogTextEntry> _dialogText;
-	int _totalTextEntries;
-	int _dialogSelectedLine;
-	Common::StringArray _saveList;
+	void setClickableLines();
+	void refreshText();
 public:
 	RexDialogView();
 	~RexDialogView();
@@ -151,6 +158,7 @@
 	RexGameMenuDialog();
 
 	virtual void onRefresh(RectList *rects, M4Surface *destSurface);
+	virtual bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
 };
 
 }

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-03-24 11:47:08 UTC (rev 48377)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-03-24 11:49:26 UTC (rev 48378)
@@ -39,6 +39,136 @@
 static const int INVENTORY_Y = 159;
 static const int SCROLLER_DELAY = 200;
 
+//--------------------------------------------------------------------------
+
+MadsTextDisplay::MadsTextDisplay() {
+	for (int i = 0; i < TEXT_DISPLAY_SIZE; ++i) {
+		MadsTextDisplayEntry rec;
+		rec.active = false;
+		_entries.push_back(rec);
+	}
+}
+
+int MadsTextDisplay::add(int xp, int yp, uint fontColour, int charSpacing, const char *msg, Font *font) {
+	int usedSlot = -1;
+
+	for (int idx = 0; idx < TEXT_DISPLAY_SIZE; ++idx) {
+		if (!_entries[idx].active) {
+			usedSlot = idx;
+
+			_entries[idx].bounds.left = xp;
+			_entries[idx].bounds.top = yp;
+			_entries[idx].font = font;
+			_entries[idx].msg = msg;
+			_entries[idx].bounds.setWidth(font->getWidth(msg, charSpacing));
+			_entries[idx].bounds.setHeight(font->getHeight());
+			_entries[idx].colour1 = fontColour & 0xff;
+			_entries[idx].colour2 = fontColour >> 8;
+			_entries[idx].spacing = charSpacing;
+			_entries[idx].expire = 1;
+			_entries[idx].active = true;
+			break;
+		}
+	}
+
+	return usedSlot;
+}
+
+void MadsTextDisplay::draw(View *view) {
+	for (uint idx = 0; idx < _entries.size(); ++idx) {
+		if (_entries[idx].active && (_entries[idx].expire >= 0)) {
+			_entries[idx].font->setColours(_entries[idx].colour1, 0xFF,
+				(_entries[idx].colour2 == 0) ? _entries[idx].colour1 : _entries[idx].colour2);
+			_entries[idx].font->writeString(view, _entries[idx].msg, 
+				_entries[idx].bounds.left, _entries[idx].bounds.top, _entries[idx].bounds.width(),
+				_entries[idx].spacing);
+		}
+	}
+
+	// Clear up any now text display entries that are to be expired
+	for (uint idx = 0; idx < _entries.size(); ++idx) {
+		if (_entries[idx].expire < 0) {
+			_entries[idx].active = false;
+			_entries[idx].expire = 0;
+		}
+	}
+}
+
+//--------------------------------------------------------------------------
+
+/**
+ * Clears the entries list
+ */
+void ScreenObjects::clear() {
+	_entries.clear();
+}
+
+/**
+ * Adds a new entry to the list of screen objects
+ */
+void ScreenObjects::add(const Common::Rect &bounds, int layer, int idx, int category) {
+	ScreenObjectEntry rec;
+	rec.bounds = bounds;
+	rec.layer = layer;
+	rec.index = idx;
+	rec.category = category;
+	rec.active = true;
+
+	_entries.push_back(rec);
+}
+
+/**
+ * Scans the list for an element that contains the given mode. The result will be 1 based for a match,
+ * with 0 indicating no entry was found
+ */
+int ScreenObjects::scan(int xp, int yp, int layer) {
+	for (uint i = 0; i < _entries.size(); ++i) {
+		if (_entries[i].active && _entries[i].bounds.contains(xp, yp) && (_entries[i].layer == layer))
+			return i + 1;
+	}
+
+	// Entry not found
+	return 0;
+}
+
+int ScreenObjects::scanBackwards(int xp, int yp, int layer) {
+	for (uint i = _entries.size() - 1; i >= 0; --i) {
+		if (_entries[i].active && _entries[i].bounds.contains(xp, yp) && (_entries[i].layer == layer))
+			return i + 1;
+	}
+
+	// Entry not found
+	return 0;
+}
+
+void ScreenObjects::setActive(int category, int idx, bool active) {
+	for (uint i = 0; i < _entries.size(); ++i) {
+		if (_entries[i].active && (_entries[i].category == category) && (_entries[i].index == idx))
+			_entries[i].active = active;
+	}
+}
+
+//--------------------------------------------------------------------------
+
+MadsView::MadsView(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent): View(vm, viewBounds, transparent) {
+	_spriteSlotsStart = 0;
+}
+
+MadsView::MadsView(MadsM4Engine *vm, int x, int y, bool transparent): View(vm, x, y, transparent) {
+	_spriteSlotsStart = 0;
+}
+
+int MadsView::getSpriteSlotsIndex() {
+	return _spriteSlotsStart++;
+}
+
+void MadsView::onRefresh(RectList *rects, M4Surface *destSurface) {
+	// Draw text elements onto the view
+	_textDisplay.draw(this);
+
+	View::onRefresh(rects, destSurface);
+}
+
 /*--------------------------------------------------------------------------
  * MadsInterfaceView handles the user interface section at the bottom of
  * game screens in MADS games

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-03-24 11:47:08 UTC (rev 48377)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-03-24 11:49:26 UTC (rev 48378)
@@ -34,6 +34,106 @@
 
 namespace M4 {
 
+class MadsSpriteSlot {
+public:
+	int spriteId;
+	int timerIndex;
+	int spriteListIndex;
+	int frameNumber;
+	int width;
+	int height;
+	int depth;
+	int scale;
+
+	MadsSpriteSlot() { };
+};
+
+#define SPRITE_SLOTS_SIZE 50
+
+class MadsTextDisplayEntry {
+public:
+	bool active;
+	int expire;
+	int spacing;
+	Common::Rect bounds;
+	uint8 colour1;
+	uint8 colour2;
+	Font *font;
+	const char *msg;
+
+	MadsTextDisplayEntry() { active = false; }
+};
+
+#define TEXT_DISPLAY_SIZE 40
+
+class MadsTextDisplay {
+private:
+	Common::Array<MadsTextDisplayEntry> _entries;
+public:
+	MadsTextDisplay();
+
+	MadsTextDisplayEntry &operator[](int idx) {
+		assert(idx < TEXT_DISPLAY_SIZE);
+		return _entries[idx];
+	}
+
+	void expire(int idx) {
+		assert(idx < TEXT_DISPLAY_SIZE);
+		_entries[idx].expire = -1;
+	}
+
+	int add(int xp, int yp, uint fontColour, int charSpacing, const char *msg, Font *font);
+	void draw(View *view);
+};
+
+class ScreenObjectEntry {
+public:
+	Common::Rect bounds;
+	int category;
+	int index;
+	int layer;
+	bool active;
+
+	ScreenObjectEntry() { active = false; }
+};
+
+#define SCREEN_OBJECTS_SIZE 
+
+class ScreenObjects {
+private:
+	Common::Array<ScreenObjectEntry> _entries;
+public:
+	ScreenObjects() {}
+
+	ScreenObjectEntry &operator[](uint idx) {
+		assert(idx < _entries.size());
+		return _entries[idx];
+	}
+
+	void clear();
+	void add(const Common::Rect &bounds, int layer, int idx, int category);
+	void draw(View *view);
+	int scan(int xp, int yp, int layer);
+	int scanBackwards(int xp, int yp, int layer);
+	void setActive(int category, int idx, bool active);
+};
+
+
+class MadsView: public View {
+protected:
+	MadsSpriteSlot _spriteSlots[SPRITE_SLOTS_SIZE];
+	MadsTextDisplay _textDisplay;
+	int _spriteSlotsStart;
+	ScreenObjects _screenObjects;
+
+	int getSpriteSlotsIndex();
+public:
+	MadsView(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent = false);
+	MadsView(MadsM4Engine *vm, int x = 0, int y = 0, bool transparent = false);
+
+	void onRefresh(RectList *rects, M4Surface *destSurface);
+};
+
 #define CHEAT_SEQUENCE_MAX 8
 
 class IntegerList : public Common::Array<int> {

Modified: scummvm/trunk/engines/m4/viewmgr.cpp
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.cpp	2010-03-24 11:47:08 UTC (rev 48377)
+++ scummvm/trunk/engines/m4/viewmgr.cpp	2010-03-24 11:49:26 UTC (rev 48378)
@@ -194,72 +194,6 @@
 
 //--------------------------------------------------------------------------
 
-MadsTextDisplay::MadsTextDisplay() {
-	for (int i = 0; i < TEXT_DISPLAY_SIZE; ++i)
-		_entries[i].active = false;
-}
-
-int MadsTextDisplay::add(int xp, int yp, uint fontColour, int charSpacing, const char *msg, Font *font) {
-	int usedSlot = -1;
-
-	for (int idx = 0; idx < TEXT_DISPLAY_SIZE; ++idx) {
-		if (!_entries[idx].active) {
-			usedSlot = idx;
-
-			_entries[idx].bounds.left = xp;
-			_entries[idx].bounds.top = yp;
-			_entries[idx].font = font;
-			_entries[idx].msg = msg;
-			_entries[idx].bounds.setWidth(font->getWidth(msg, charSpacing));
-			_entries[idx].bounds.setHeight(font->getHeight());
-			_entries[idx].colour1 = fontColour & 0xff;
-			_entries[idx].colour2 = fontColour >> 8;
-			_entries[idx].spacing = charSpacing;
-			_entries[idx].active2 = 1;
-			_entries[idx].active = true;
-			break;
-		}
-	}
-
-	return usedSlot;
-}
-
-void MadsTextDisplay::draw(View *view) {
-	for (int idx = 0; idx < OLD_TEXT_DISPLAY_SIZE; ++idx) {
-		if (_entries[idx].active && (_entries[idx].active2 >= 0)) {
-			_entries[idx].font->setColours(_entries[idx].colour1, 0xFF,
-				(_entries[idx].colour2 == 0) ? _entries[idx].colour1 : _entries[idx].colour2);
-			_entries[idx].font->writeString(view, _entries[idx].msg, 
-				_entries[idx].bounds.left, _entries[idx].bounds.top, _entries[idx].bounds.width(),
-				_entries[idx].spacing);
-		}
-	}
-
-	// Clear up any now inactive text display entries
-	for (int idx = 0; idx < OLD_TEXT_DISPLAY_SIZE; ++idx) {
-		if (_entries[idx].active2 < 0) {
-			_entries[idx].active = false;
-			_entries[idx].active2 = 0;
-		}
-	}
-}
-
-//--------------------------------------------------------------------------
-
-MadsView::MadsView(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent): View(vm, viewBounds, transparent) {
-	_spriteSlotsStart = 0;
-}
-
-MadsView::MadsView(MadsM4Engine *vm, int x, int y, bool transparent): View(vm, x, y, transparent) {
-	_spriteSlotsStart = 0;
-}
-
-int MadsView::getSpriteSlotsIndex() {
-	return _spriteSlotsStart++;
-}
-
-//--------------------------------------------------------------------------
-
 ViewManager::ViewManager(MadsM4Engine *vm): _systemHotkeys(HotkeyList(NULL)), _vm(vm) {
 	_captureScreen = NULL;
 	_captureEvents = false;

Modified: scummvm/trunk/engines/m4/viewmgr.h
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.h	2010-03-24 11:47:08 UTC (rev 48377)
+++ scummvm/trunk/engines/m4/viewmgr.h	2010-03-24 11:49:26 UTC (rev 48378)
@@ -148,71 +148,6 @@
 	bool _transparent;
 };
 
-class MadsSpriteSlot {
-public:
-	int spriteId;
-	int timerIndex;
-	int spriteListIndex;
-	int frameNumber;
-	int width;
-	int height;
-	int depth;
-	int scale;
-
-	MadsSpriteSlot() { };
-};
-
-#define SPRITE_SLOTS_SIZE 50
-
-class MadsTextDisplayEntry {
-public:
-	bool active;
-	int spacing;
-	Common::Rect bounds;
-	int active2;
-	uint8 colour1;
-	uint8 colour2;
-	Font *font;
-	const char *msg;
-
-	MadsTextDisplayEntry() { active = false; }
-};
-
-#define TEXT_DISPLAY_SIZE 40
-
-class MadsTextDisplay {
-private:
-	MadsTextDisplayEntry _entries[TEXT_DISPLAY_SIZE];
-public:
-	MadsTextDisplay();
-
-	MadsTextDisplayEntry &operator[](int idx) {
-		assert(idx < TEXT_DISPLAY_SIZE);
-		return _entries[idx];
-	}
-
-	int setActive2(int idx) {
-		assert(idx < TEXT_DISPLAY_SIZE);
-		_entries[idx].active2 = -1;
-	}
-
-	int add(int xp, int yp, uint fontColour, int charSpacing, const char *msg, Font *font);
-	void draw(View *view);
-};
-
-class MadsView: public View {
-protected:
-	MadsSpriteSlot _spriteSlots[SPRITE_SLOTS_SIZE];
-	MadsTextDisplay _textDisplay;
-	int _spriteSlotsStart;
-
-	int getSpriteSlotsIndex();
-public:
-	MadsView(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent = false);
-	MadsView(MadsM4Engine *vm, int x = 0, int y = 0, bool transparent = false);
-
-};
-
 class ViewManager {
 private:
 	MadsM4Engine *_vm;


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

Revision: 48401
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48401&view=rev
Author:   dreammaster
Date:     2010-03-25 12:46:06 +0000 (Thu, 25 Mar 2010)

Log Message:
-----------
Added preliminary logic for showing loaded sprite frames

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

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-03-25 10:11:26 UTC (rev 48400)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-03-25 12:46:06 UTC (rev 48401)
@@ -609,7 +609,7 @@
 	_totalTextEntries = 0;
 
 	// Set up a default sprite slot entry
-	_spriteSlotsStart = 1;
+	_spriteSlots.startIndex = 1;
 	_spriteSlots[0].spriteId = -2;
 	_spriteSlots[0].timerIndex = -1;
 }
@@ -637,9 +637,6 @@
 	_madsVm->_palette->deleteRange(_bgPalData);
 	delete _bgPalData;
 	delete _backgroundSurface;
-	_madsVm->_palette->deleteRange(_spritesPalData);
-	delete _spritesPalData;
-	delete _menuSprites;
 }
 
 void RexDialogView::loadBackground() {
@@ -677,14 +674,7 @@
 void RexDialogView::loadMenuSprites() {
 	const char *SPRITES_NAME = "*MENU.SS";
 
-	Common::SeekableReadStream *data = _vm->res()->get(SPRITES_NAME);
-	_menuSprites = new SpriteAsset(_vm, data, data->size(), SPRITES_NAME);
-	_vm->res()->toss(SPRITES_NAME);
-
-	// Slot it into available palette space
-	_spritesPalData = _menuSprites->getRgbList();
-	_vm->_palette->addRange(_spritesPalData);
-	_menuSprites->translate(_spritesPalData, true);
+	_spriteSlots.addSprites(SPRITES_NAME);
 }
 
 
@@ -708,14 +698,15 @@
 }
 
 void RexDialogView::setFrame(int frameNumber, int depth) {
-	int slotIndex = getSpriteSlotsIndex();
+	int slotIndex = _spriteSlots.getIndex();
 	_spriteSlots[slotIndex].spriteId = 1;
 	_spriteSlots[slotIndex].timerIndex = 1;
 	_spriteSlots[slotIndex].spriteListIndex = 0; //_menuSpritesIndex;
 	_spriteSlots[slotIndex].frameNumber = frameNumber;
-	M4Sprite *spr = _menuSprites->getFrame(0);
-	_spriteSlots[slotIndex].width = spr->width();
-	_spriteSlots[slotIndex].height = spr->height();
+
+	M4Sprite *spr = _spriteSlots.getSprite(0).getFrame(0);
+	_spriteSlots[slotIndex].xp = spr->x;
+	_spriteSlots[slotIndex].yp = spr->y;
 	_spriteSlots[slotIndex].depth = depth;
 	_spriteSlots[slotIndex].scale = 100;
 }
@@ -890,6 +881,11 @@
 	setFrame(1, 2);
 	initVars();
 
+	// TODO: Replace with proper palette setting
+	uint32 c = 0xffffff;
+	for (int i = 9; i <= 15; ++i)
+		_vm->_palette->setPalette((const byte *)&c, i, 1);
+
 	_vm->_font->setFont(FONT_CONVERSATION_MADS);
 	addLines();
 	setClickableLines();
@@ -897,7 +893,7 @@
 
 void RexGameMenuDialog::addLines() {
 	// Add the title
-	int top = (height() - MADS_SURFACE_HEIGHT) / 2 +  -((((_vm->_font->getHeight() + 2) * 6) >> 1) - 78);
+	int top = MADS_Y_OFFSET - ((((_vm->_font->getHeight() + 2) * 6) >> 1) - 78);
 		
 	addQuote(_vm->_font, ALIGN_CENTER, 0, top, 10);
 

Modified: scummvm/trunk/engines/m4/mads_menus.h
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.h	2010-03-25 10:11:26 UTC (rev 48400)
+++ scummvm/trunk/engines/m4/mads_menus.h	2010-03-25 12:46:06 UTC (rev 48401)
@@ -124,7 +124,6 @@
 	M4Surface *_backgroundSurface;
 	RGBList *_bgPalData;
 	SpriteAsset *_menuSprites;
-	RGBList *_spritesPalData;
 
 	Common::Array<DialogTextEntry> _dialogText;
 	Common::StringArray _textLines;

Modified: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	2010-03-25 10:11:26 UTC (rev 48400)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-03-25 12:46:06 UTC (rev 48401)
@@ -31,7 +31,6 @@
 namespace M4 {
 
 #define INTERFACE_HEIGHT 106
-#define MADS_SURFACE_HEIGHT 156
 
 struct SpriteSlot {
 	int16 spriteId;

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-03-25 10:11:26 UTC (rev 48400)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-03-25 12:46:06 UTC (rev 48401)
@@ -32,6 +32,8 @@
 #include "m4/m4.h"
 #include "m4/staticres.h"
 
+#include "common/algorithm.h"
+
 namespace M4 {
 
 static const int INV_ANIM_FRAME_SPEED = 8;
@@ -41,6 +43,86 @@
 
 //--------------------------------------------------------------------------
 
+int MadsSpriteSlots::getIndex() {
+	return startIndex++;
+}
+
+void MadsSpriteSlots::addSprites(const char *resName) {
+	// Get the sprite set
+	Common::SeekableReadStream *data = _vm->res()->get(resName);
+	SpriteAsset *spriteSet = new SpriteAsset(_vm, data, data->size(), resName);
+	spriteSet->translate(_madsVm->_palette);
+
+	_sprites.push_back(SpriteList::value_type(spriteSet));
+	_vm->res()->toss(resName);
+
+	// Translate the sprite set to the current palette
+}
+
+class DepthEntry {
+public:
+	int depth;
+	int index;
+
+	DepthEntry(int depthAmt, int indexVal) { depth = depthAmt; index = indexVal; }
+};
+
+bool sortHelper(const DepthEntry &entry1, const DepthEntry &entry2) {
+	return entry1.depth < entry2.depth;
+}
+
+typedef Common::List<DepthEntry> DepthList;
+
+void MadsSpriteSlots::draw(View *view) {
+	DepthList depthList;
+
+	// Get a list of sprite object depths for active objects
+	for (int i = 0; i < startIndex; ++i) {
+		if (_entries[i].spriteId >= 0) {
+			DepthEntry rec(_entries[i].depth, i);
+			depthList.push_back(rec);
+		}
+	}
+
+	// Sort the list in order of the depth
+	Common::sort(depthList.begin(), depthList.end(), sortHelper);
+
+	// Loop through each of the objectes
+	DepthList::iterator i;
+	for (i = depthList.begin(); i != depthList.end(); ++i) {
+		DepthEntry &de = *i;
+		MadsSpriteSlot &slot = _entries[de.index];
+		assert(slot.spriteListIndex < (int)_sprites.size());
+		SpriteAsset &spriteSet = *_sprites[slot.spriteListIndex].get();
+
+		if (slot.scale < 100) {
+			// Minimalised drawing
+			assert(slot.spriteListIndex < (int)_sprites.size());
+			M4Sprite *spr = spriteSet.getFrame(slot.frameNumber - 1);
+			spr->draw(view, slot.scale, slot.depth, slot.xp, MADS_Y_OFFSET + slot.yp);
+		} else {
+			int xp, yp;
+			M4Sprite *spr = spriteSet.getFrame(slot.frameNumber - 1);
+
+			if (slot.scale == -1) {
+				xp = slot.xp; // - widthAdjust;
+				yp = slot.yp; // - heightAdjust;
+			} else {
+				xp = slot.xp - (spr->width() / 2); // - widthAdjust;
+				yp = slot.yp - spr->height() + 1; // - heightAdjust;
+			}
+
+			if (slot.depth > 1) {
+				spr->draw2(view, slot.depth, xp, MADS_Y_OFFSET + yp);
+			} else {
+				spr->draw3(view, xp, MADS_Y_OFFSET + yp);
+			}
+		}
+	}
+}
+
+//--------------------------------------------------------------------------
+
 MadsTextDisplay::MadsTextDisplay() {
 	for (int i = 0; i < TEXT_DISPLAY_SIZE; ++i) {
 		MadsTextDisplayEntry rec;
@@ -132,12 +214,9 @@
 }
 
 int ScreenObjects::scanBackwards(int xp, int yp, int layer) {
-	for (uint i = _entries.size() - 1; ; --i) {
+	for (int i = (int)_entries.size() - 1; i >= 0; --i) {
 		if (_entries[i].active && _entries[i].bounds.contains(xp, yp) && (_entries[i].layer == layer))
 			return i + 1;
-
-		if (i == 0)
-			break;
 	}
 
 	// Entry not found
@@ -154,18 +233,15 @@
 //--------------------------------------------------------------------------
 
 MadsView::MadsView(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent): View(vm, viewBounds, transparent) {
-	_spriteSlotsStart = 0;
 }
 
 MadsView::MadsView(MadsM4Engine *vm, int x, int y, bool transparent): View(vm, x, y, transparent) {
-	_spriteSlotsStart = 0;
 }
 
-int MadsView::getSpriteSlotsIndex() {
-	return _spriteSlotsStart++;
-}
+void MadsView::onRefresh(RectList *rects, M4Surface *destSurface) {
+	// Draw any sprites
+	_spriteSlots.draw(this);
 
-void MadsView::onRefresh(RectList *rects, M4Surface *destSurface) {
 	// Draw text elements onto the view
 	_textDisplay.draw(this);
 

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-03-25 10:11:26 UTC (rev 48400)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-03-25 12:46:06 UTC (rev 48401)
@@ -34,14 +34,19 @@
 
 namespace M4 {
 
+#define MADS_SURFACE_HEIGHT 156
+#define MADS_SCREEN_HEIGHT 200
+#define MADS_Y_OFFSET ((MADS_SCREEN_HEIGHT - MADS_SURFACE_HEIGHT) / 2)
+
+
 class MadsSpriteSlot {
 public:
 	int spriteId;
 	int timerIndex;
 	int spriteListIndex;
 	int frameNumber;
-	int width;
-	int height;
+	int xp;
+	int yp;
 	int depth;
 	int scale;
 
@@ -50,6 +55,32 @@
 
 #define SPRITE_SLOTS_SIZE 50
 
+typedef public Common::Array<Common::SharedPtr<SpriteAsset>> SpriteList;
+
+class MadsSpriteSlots {
+private:
+	MadsSpriteSlot _entries[SPRITE_SLOTS_SIZE];
+	SpriteList _sprites;
+public:
+	int startIndex;
+
+	MadsSpriteSlots() { startIndex = 0; }
+
+	MadsSpriteSlot &operator[](int idx) {
+		assert(idx < SPRITE_SLOTS_SIZE);
+		return _entries[idx];
+	}
+	SpriteAsset &getSprite(int idx) {
+		assert(idx < (int)_sprites.size());
+		return *_sprites[idx].get();
+	}
+
+	int getIndex();
+	void addSprites(const char *resName);
+
+	void draw(View *view);
+};
+
 class MadsTextDisplayEntry {
 public:
 	bool active;
@@ -97,8 +128,6 @@
 	ScreenObjectEntry() { active = false; }
 };
 
-#define SCREEN_OBJECTS_SIZE 
-
 class ScreenObjects {
 private:
 	Common::Array<ScreenObjectEntry> _entries;
@@ -119,14 +148,12 @@
 };
 
 
+
 class MadsView: public View {
 protected:
-	MadsSpriteSlot _spriteSlots[SPRITE_SLOTS_SIZE];
+	MadsSpriteSlots _spriteSlots;
 	MadsTextDisplay _textDisplay;
-	int _spriteSlotsStart;
 	ScreenObjects _screenObjects;
-
-	int getSpriteSlotsIndex();
 public:
 	MadsView(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent = false);
 	MadsView(MadsM4Engine *vm, int x = 0, int y = 0, bool transparent = false);

Modified: scummvm/trunk/engines/m4/sprite.cpp
===================================================================
--- scummvm/trunk/engines/m4/sprite.cpp	2010-03-25 10:11:26 UTC (rev 48400)
+++ scummvm/trunk/engines/m4/sprite.cpp	2010-03-25 12:46:06 UTC (rev 48401)
@@ -54,8 +54,8 @@
 		loadMadsSprite(source);
 	}
 
-	xOffset = xOfs;
-	yOffset = yOfs;
+	x = xOffset = xOfs;
+	y = yOffset = yOfs;
 
 }
 

Modified: scummvm/trunk/engines/m4/sprite.h
===================================================================
--- scummvm/trunk/engines/m4/sprite.h	2010-03-25 10:11:26 UTC (rev 48400)
+++ scummvm/trunk/engines/m4/sprite.h	2010-03-25 12:46:06 UTC (rev 48401)
@@ -115,6 +115,18 @@
 	void loadDeltaRle(Common::SeekableReadStream* rleData, int destX, int destY);
 	void loadMadsSprite(Common::SeekableReadStream* source);
 
+	void draw(M4Surface *destSurface, int scale, int depth, int xp, int yp) {
+		// TODO: Properly implement drawing
+		copyTo(destSurface, xp, yp);
+	}
+	void draw2(M4Surface *destSurface, int depth, int xp, int yp) {
+		// TODO: Properly implement drawing
+		copyTo(destSurface, xp, yp);
+	}
+	void draw3(M4Surface *destSurface, int xp, int yp) {
+		// TODO: Properly implement drawing
+		copyTo(destSurface, xp, yp);
+	}
 	byte getTransparentColor() const;
 protected:
 };


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

Revision: 48403
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48403&view=rev
Author:   dreammaster
Date:     2010-03-26 09:35:48 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
Bugfix for logic used to calculate single RGB palette entries

Modified Paths:
--------------
    scummvm/trunk/engines/m4/graphics.cpp
    scummvm/trunk/engines/m4/mads_logic.cpp

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2010-03-25 12:54:55 UTC (rev 48402)
+++ scummvm/trunk/engines/m4/graphics.cpp	2010-03-26 09:35:48 UTC (rev 48403)
@@ -768,7 +768,7 @@
 }
 
 void Palette::setEntry(uint index, uint8 r, uint8 g, uint8 b) {
-	uint32 c = (r << 16) | (g << 8) || b;
+	uint32 c = (r << 16) | (g << 8) | b;
 	g_system->setPalette((const byte *)&c, index, 1);
 }
 

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-03-25 12:54:55 UTC (rev 48402)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-03-26 09:35:48 UTC (rev 48403)
@@ -59,8 +59,8 @@
 //	if ((_sceneNumber == 105) ((_sceneNumber == 109) && (word_84800 != 0)))
 //		_madsVm->globals()->playerSpriteChanged = true;
 
-	_vm->_palette->setEntry(16, 0x38, 0xFF, 0xFF);
-	_vm->_palette->setEntry(17, 0x38, 0xb4, 0xb4);
+//	_vm->_palette->setEntry(16, 0x38, 0xFF, 0xFF);
+//	_vm->_palette->setEntry(17, 0x38, 0xb4, 0xb4);
 }
 
 void MadsSceneLogic::getAnimName() {


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

Revision: 48405
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48405&view=rev
Author:   dreammaster
Date:     2010-03-26 20:45:32 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
Bugfixes to the graphics display of dialogs

Modified Paths:
--------------
    scummvm/trunk/engines/m4/graphics.cpp
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/mads_views.cpp
    scummvm/trunk/engines/m4/sprite.h

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2010-03-26 10:21:08 UTC (rev 48404)
+++ scummvm/trunk/engines/m4/graphics.cpp	2010-03-26 20:45:32 UTC (rev 48405)
@@ -772,7 +772,7 @@
 	c.r = r;
 	c.g = g;
 	c.b = b;
-	c.u = 0;
+	c.u = 255;
 	g_system->setPalette((const byte *)&c, index, 1);
 }
 

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-03-26 10:21:08 UTC (rev 48404)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-03-26 20:45:32 UTC (rev 48405)
@@ -685,8 +685,8 @@
 	// Draw the framed base area
 	fillRect(this->bounds(), _madsVm->_palette->BLACK);
 	setColour(2);
-	hLine(0, width(), 0);
-	hLine(0, width(), height() - 1);
+	hLine(0, width(), MADS_Y_OFFSET - 2);
+	hLine(0, width(), MADS_Y_OFFSET + MADS_SURFACE_HEIGHT + 2);
 
 	// Add in the loaded background vertically centred
 	_backgroundSurface->copyTo(this, 0, (height() - MADS_SURFACE_HEIGHT) / 2);
@@ -881,11 +881,6 @@
 	setFrame(1, 2);
 	initVars();
 
-	// TODO: Replace with proper palette setting
-	uint32 c = 0xffffff;
-	for (int i = 9; i <= 15; ++i)
-		_vm->_palette->setPalette((const byte *)&c, i, 1);
-
 	_vm->_font->setFont(FONT_CONVERSATION_MADS);
 	addLines();
 	setClickableLines();
@@ -893,7 +888,7 @@
 
 void RexGameMenuDialog::addLines() {
 	// Add the title
-	int top = MADS_Y_OFFSET - ((((_vm->_font->getHeight() + 2) * 6) >> 1) - 78);
+	int top = MADS_Y_OFFSET - 2 - ((((_vm->_font->getHeight() + 2) * 6) >> 1) - 78);
 		
 	addQuote(_vm->_font, ALIGN_CENTER, 0, top, 10);
 

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-03-26 10:21:08 UTC (rev 48404)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-03-26 20:45:32 UTC (rev 48405)
@@ -99,7 +99,7 @@
 			// Minimalised drawing
 			assert(slot.spriteListIndex < (int)_sprites.size());
 			M4Sprite *spr = spriteSet.getFrame(slot.frameNumber - 1);
-			spr->draw(view, slot.scale, slot.depth, slot.xp, MADS_Y_OFFSET + slot.yp);
+			spr->draw1(view, slot.scale, slot.depth, slot.xp, MADS_Y_OFFSET + slot.yp);
 		} else {
 			int xp, yp;
 			M4Sprite *spr = spriteSet.getFrame(slot.frameNumber - 1);
@@ -159,8 +159,8 @@
 void MadsTextDisplay::draw(View *view) {
 	for (uint idx = 0; idx < _entries.size(); ++idx) {
 		if (_entries[idx].active && (_entries[idx].expire >= 0)) {
-			_entries[idx].font->setColours(_entries[idx].colour1, 0xFF,
-				(_entries[idx].colour2 == 0) ? _entries[idx].colour1 : _entries[idx].colour2);
+			_entries[idx].font->setColours(_entries[idx].colour1, 
+				(_entries[idx].colour2 == 0) ? _entries[idx].colour1 : _entries[idx].colour2, 0xff);
 			_entries[idx].font->writeString(view, _entries[idx].msg, 
 				_entries[idx].bounds.left, _entries[idx].bounds.top, _entries[idx].bounds.width(),
 				_entries[idx].spacing);

Modified: scummvm/trunk/engines/m4/sprite.h
===================================================================
--- scummvm/trunk/engines/m4/sprite.h	2010-03-26 10:21:08 UTC (rev 48404)
+++ scummvm/trunk/engines/m4/sprite.h	2010-03-26 20:45:32 UTC (rev 48405)
@@ -115,17 +115,17 @@
 	void loadDeltaRle(Common::SeekableReadStream* rleData, int destX, int destY);
 	void loadMadsSprite(Common::SeekableReadStream* source);
 
-	void draw(M4Surface *destSurface, int scale, int depth, int xp, int yp) {
+	void draw1(M4Surface *destSurface, int scale, int depth, int xp, int yp) {
 		// TODO: Properly implement drawing
-		copyTo(destSurface, xp, yp);
+		copyTo(destSurface, xp, yp, 0);
 	}
 	void draw2(M4Surface *destSurface, int depth, int xp, int yp) {
 		// TODO: Properly implement drawing
-		copyTo(destSurface, xp, yp);
+		copyTo(destSurface, xp, yp, 0);
 	}
 	void draw3(M4Surface *destSurface, int xp, int yp) {
 		// TODO: Properly implement drawing
-		copyTo(destSurface, xp, yp);
+		copyTo(destSurface, xp, yp, 0);
 	}
 	byte getTransparentColor() const;
 protected:


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

Revision: 48409
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48409&view=rev
Author:   dreammaster
Date:     2010-03-27 07:14:52 +0000 (Sat, 27 Mar 2010)

Log Message:
-----------
Completed dialog item selection code

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

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-03-27 07:13:30 UTC (rev 48408)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-03-27 07:14:52 UTC (rev 48409)
@@ -589,8 +589,9 @@
 RexDialogView::RexDialogView(): MadsView(_madsVm, Common::Rect(0, 0, _madsVm->_screen->width(), _madsVm->_screen->height())) {
 	_screenType = VIEWID_MENU;
 
-	// Store the previously active scene
+	// Initialise class variables
 	_priorSceneId = _madsVm->_scene->getCurrentScene();
+	_dialogType = DIALOG_NONE;
 
 	// Load necessary quotes
 	_madsVm->globals()->loadQuoteRange(1, 48);
@@ -697,6 +698,90 @@
 	MadsView::onRefresh(rects, destSurface);
 }
 
+/**
+ * Handles item selection within dialogs
+ */
+bool RexDialogView::onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents) {
+	static bool word_7F28C = false;
+	int word_7FED2 = 0;
+	int word_8502A = 0;
+
+	// If it's a keypress, handle it immediately
+	if (eventType == KEVENT_KEY) {
+		switch (param1) {
+		case Common::KEYCODE_q | (Common::KBD_CTRL << 24):
+		case Common::KEYCODE_q | (Common::KBD_ALT << 24):
+			_madsVm->quitGame();
+			return true;
+		case Common::KEYCODE_RETURN:
+			_enterFlag = true;
+			_selectedLine = 0;
+			break;
+		case Common::KEYCODE_ESCAPE:
+			_selectedLine = 0;
+			break;
+		default:
+			return false;
+		}
+	}
+
+	// Mark all the dialog text entries as not being seelcted
+	for (uint i = 0; i < _dialogText.size(); ++i)
+		_dialogText[i].state = STATE_DESELECTED;
+
+	// Check if the mouse is over a registered screen object
+	int idx = _screenObjects.scan(x, y, LAYER_GUI);
+
+	if (word_7F28C) {
+		if (y < _screenObjects[2].bounds.top) {
+			if (eventType != MEVENT_LEFT_RELEASE)
+				_dialogText[1].state = STATE_SELECTED;
+			idx = 19;
+		}
+
+		if (y > _screenObjects[8].bounds.bottom) {
+			if (eventType != MEVENT_LEFT_RELEASE)
+				_dialogText[7].state = STATE_SELECTED;
+			idx = 20;
+		}
+	}
+
+	if ((idx > 0) && ((eventType == MEVENT_LEFT_HOLD) || (eventType == MEVENT_LEFT_DRAG) ||
+					(eventType == MEVENT_LEFT_RELEASE))) {
+		int objIndex = _screenObjects[idx].index;
+
+		if ((_dialogType == DIALOG_SAVE) || (_dialogType == DIALOG_RESTORE)) {
+			if ((objIndex > 7) && (objIndex <= 14))
+				_dialogText[objIndex].state = STATE_SELECTED;
+		}
+
+		if (word_7FED2)
+			word_7F28C = (objIndex > 0) && (objIndex <= 7);
+
+		if (_screenObjects[idx].category == 1)
+			_dialogText[objIndex].state = STATE_SELECTED;
+	} else {
+		idx = -1;
+	}
+
+	if (idx == 0)
+		idx = -1;
+
+	if (_dialogType == DIALOG_ERROR) {
+		if (idx == 1)
+			idx = -1;
+	}
+
+	if (eventType == MEVENT_LEFT_RELEASE) {
+		if (!word_7F28C || (idx <= 18))
+			_selectedLine = idx;
+
+		word_8502A = -1;
+	}
+
+	return true;
+}
+
 void RexDialogView::setFrame(int frameNumber, int depth) {
 	int slotIndex = _spriteSlots.getIndex();
 	_spriteSlots[slotIndex].spriteId = 1;
@@ -747,7 +832,7 @@
 	if (rec) {
 		strcpy(rec->text, msg_p);
 		rec->font = font;
-		rec->state = 0;
+		rec->state = STATE_DESELECTED;
 		rec->pos.y = top;
 		rec->widthAdjust = -1;
 		rec->in_use = true;
@@ -848,7 +933,7 @@
 		uint colour;
 		if (_dialogText[i].state == STATE_DESELECTED)
 			colour = 0xB0A;
-		else if (_dialogText[i].state == STATE_HIGHLIGHTED)
+		else if (_dialogText[i].state == STATE_SELECTED)
 			colour = 0xD0C;
 		else
 			colour = 0xF0E;
@@ -878,6 +963,7 @@
  */
 
 RexGameMenuDialog::RexGameMenuDialog(): RexDialogView() {
+	_dialogType = DIALOG_GAME_MENU;
 	setFrame(1, 2);
 	initVars();
 
@@ -905,26 +991,9 @@
 }
 
 bool RexGameMenuDialog::onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents) {
-	bool handled = false;
+	// Call the parent event handler to handle line selection
+	bool handled = RexDialogView::onEvent(eventType, param1, x, y, captureEvents);
 
-	// Handle various event types
-	switch (eventType) {
-	case MEVENT_LEFT_CLICK:
-		// Left mouse click
-		// TODO: Check and figure out _selectedLine
-		handled = true;
-		break;
-
-	case KEVENT_KEY:
-		// Handle standard dialog keypresses
-
-		handled = true;
-		break;
-
-	default:
-		break;
-	}
-
 	if (_selectedLine > 0) {
 		switch (_selectedLine) {
 		case 1:

Modified: scummvm/trunk/engines/m4/mads_menus.h
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.h	2010-03-27 07:13:30 UTC (rev 48408)
+++ scummvm/trunk/engines/m4/mads_menus.h	2010-03-27 07:14:52 UTC (rev 48409)
@@ -91,12 +91,12 @@
 	void updateState();
 };
 
-enum DialogTextState {STATE_DESELECTED = 0, STATE_HIGHLIGHTED = 1, STATE_SELECTED = 2};
+enum DialogTextState {STATE_DESELECTED = 0, STATE_SELECTED = 1, STATE_UNKNOWN = 2};
 
 class DialogTextEntry {
 public:
 	bool in_use;
-	int state;
+	DialogTextState state;
 	Common::Point pos;
 	char text[80];
 	Font *font;
@@ -112,7 +112,7 @@
 enum MadsTextAlignment { ALIGN_CENTER = -1, ALIGN_CHAR_CENTER = -2, RIGHT_ALIGN = -3 };
 
 
-class RexDialogView: public MadsView {
+class RexDialogView : public MadsView {
 private:
 	int _priorSceneId;
 
@@ -121,6 +121,7 @@
 	void loadBackground();
 	void loadMenuSprites();
 protected:
+	MadsDialogType _dialogType;
 	M4Surface *_backgroundSurface;
 	RGBList *_bgPalData;
 	SpriteAsset *_menuSprites;
@@ -148,9 +149,10 @@
 
 	virtual void updateState();
 	virtual void onRefresh(RectList *rects, M4Surface *destSurface);
+	virtual bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
 };
 
-class RexGameMenuDialog: public RexDialogView {
+class RexGameMenuDialog : public RexDialogView {
 private:
 	void addLines();
 public:

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-03-27 07:13:30 UTC (rev 48408)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-03-27 07:14:52 UTC (rev 48409)
@@ -135,8 +135,8 @@
 	ScreenObjects() {}
 
 	ScreenObjectEntry &operator[](uint idx) {
-		assert(idx < _entries.size());
-		return _entries[idx];
+		assert(idx <= _entries.size());
+		return _entries[idx - 1];
 	}
 
 	void clear();


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

Revision: 48410
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48410&view=rev
Author:   dreammaster
Date:     2010-03-27 10:44:38 +0000 (Sat, 27 Mar 2010)

Log Message:
-----------
Added the game options dialog, along with several bugfixes to dialog display code

Modified Paths:
--------------
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/mads_menus.h
    scummvm/trunk/engines/m4/mads_views.cpp
    scummvm/trunk/engines/m4/mads_views.h

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2010-03-27 07:14:52 UTC (rev 48409)
+++ scummvm/trunk/engines/m4/globals.h	2010-03-27 10:44:38 UTC (rev 48410)
@@ -213,6 +213,16 @@
 enum MadsDialogType { DIALOG_NONE = 0, DIALOG_GAME_MENU = 1, DIALOG_SAVE = 2, DIALOG_RESTORE = 3, DIALOG_OPTIONS = 4,
 		DIALOG_DIFFICULTY = 5, DIALOG_ERROR = 6};
 
+struct MadsConfigData {
+	bool musicFlag;
+	bool soundFlag;
+	bool easyMouse;
+	bool invObjectsStill;
+	bool textWindowStill;
+	int storyMode;
+	int screenFades;
+};
+
 class MadsGlobals : public Globals {
 private:
 	struct MessageItem {
@@ -234,10 +244,7 @@
 
 	// MADS variables
 	int _globals[TOTAL_NUM_VARIABLES];
-	bool easyMouse;
-	bool invObjectsStill;
-	bool textWindowStill;
-	int storyMode;
+	MadsConfigData _config;
 	bool playerSpriteChanged;
 	MadsDialogType dialogType;
 	int sceneNumber;

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2010-03-27 07:14:52 UTC (rev 48409)
+++ scummvm/trunk/engines/m4/m4.cpp	2010-03-27 10:44:38 UTC (rev 48410)
@@ -524,10 +524,11 @@
 	globs->loadMadsObjects();
 
 	// Setup globals
-	globs->easyMouse = true;
-	globs->invObjectsStill = false;
-	globs->textWindowStill = false;
-	globs->storyMode = 0;
+	globs->_config.easyMouse = true;
+	globs->_config.invObjectsStill = false;
+	globs->_config.textWindowStill = false;
+	globs->_config.storyMode = 1;	// Naughty
+	globs->_config.screenFades = 0;
 
 	// Test code to dump all messages to the console
 	//for (int i = 0; i < _globals->getMessagesSize(); i++)
@@ -600,6 +601,9 @@
 	case DIALOG_GAME_MENU:
 		dlg = new RexGameMenuDialog();
 		break;
+	case DIALOG_OPTIONS:
+		dlg = new RexOptionsDialog();
+		break;
 	default:
 		error("Unknown dialog type");
 	};

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-03-27 07:14:52 UTC (rev 48409)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-03-27 10:44:38 UTC (rev 48410)
@@ -746,9 +746,10 @@
 		}
 	}
 
+	int objIndex = -1;
 	if ((idx > 0) && ((eventType == MEVENT_LEFT_HOLD) || (eventType == MEVENT_LEFT_DRAG) ||
 					(eventType == MEVENT_LEFT_RELEASE))) {
-		int objIndex = _screenObjects[idx].index;
+		objIndex = _screenObjects[idx].index;
 
 		if ((_dialogType == DIALOG_SAVE) || (_dialogType == DIALOG_RESTORE)) {
 			if ((objIndex > 7) && (objIndex <= 14))
@@ -773,8 +774,8 @@
 	}
 
 	if (eventType == MEVENT_LEFT_RELEASE) {
-		if (!word_7F28C || (idx <= 18))
-			_selectedLine = idx;
+		if (!word_7F28C || (objIndex <= 18))
+			_selectedLine = objIndex;
 
 		word_8502A = -1;
 	}
@@ -789,7 +790,7 @@
 	_spriteSlots[slotIndex].spriteListIndex = 0; //_menuSpritesIndex;
 	_spriteSlots[slotIndex].frameNumber = frameNumber;
 
-	M4Sprite *spr = _spriteSlots.getSprite(0).getFrame(0);
+	M4Sprite *spr = _spriteSlots.getSprite(0).getFrame(frameNumber - 1);
 	_spriteSlots[slotIndex].xp = spr->x;
 	_spriteSlots[slotIndex].yp = spr->y;
 	_spriteSlots[slotIndex].depth = depth;
@@ -841,7 +842,7 @@
 		switch (alignment) {
 		case ALIGN_CENTER:
 			// Center text
-			rec->pos.x = (width() - font->getWidth(rec->text)) / 2;
+			rec->pos.x = (width() - font->getWidth(rec->text)) / 2 + left;
 			break;
 
 		case ALIGN_CHAR_CENTER: {
@@ -855,7 +856,7 @@
 				int strWidth = font->getWidth(rec->text, rec->widthAdjust);
 				// Remove the character from the string. strcpy isn't used here because it's unsafe for
 				// copying within the same string
-				while ((*p == *(p + 1)) != '\0') ++p;
+				while ((*p = *(p + 1)) != '\0') ++p;
 
 				rec->pos.x = (width() / 2) - strWidth;
 			} else {
@@ -958,7 +959,7 @@
 }
 
 /*--------------------------------------------------------------------------
- * RexDialogView is the Rex Nebular Game Menu dialog
+ * RexGameMenuDialog is the main game dialog for the game
  *--------------------------------------------------------------------------
  */
 
@@ -986,10 +987,6 @@
 	}
 }
 
-void RexGameMenuDialog::onRefresh(RectList *rects, M4Surface *destSurface) {
-	RexDialogView::onRefresh(rects, destSurface);
-}
-
 bool RexGameMenuDialog::onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents) {
 	// Call the parent event handler to handle line selection
 	bool handled = RexDialogView::onEvent(eventType, param1, x, y, captureEvents);
@@ -997,11 +994,25 @@
 	if (_selectedLine > 0) {
 		switch (_selectedLine) {
 		case 1:
+			// Save Game
 			_madsVm->globals()->dialogType = DIALOG_SAVE;
+			break;
 		case 2:
+			// Restore Game
 			_madsVm->globals()->dialogType = DIALOG_RESTORE;
+			break;
 		case 3:
+			// Game Play Options
 			_madsVm->globals()->dialogType = DIALOG_OPTIONS;
+			break;
+		case 4:
+			// Resume Current Game
+			_madsVm->globals()->dialogType = DIALOG_NONE;
+			break;
+		case 5:
+			// Exit From Game
+			_madsVm->quitGame();
+			break;
 		default:
 			// TODO: Extra logic for such as resuming scene if necessary
 			_madsVm->globals()->dialogType = DIALOG_NONE;
@@ -1015,5 +1026,136 @@
 	return handled;
 }
 
+/*--------------------------------------------------------------------------
+ * RexOptionsDialog is the game options dialog for Rex Nebular
+ *--------------------------------------------------------------------------
+ */
 
+RexOptionsDialog::RexOptionsDialog(): RexDialogView() {
+	_dialogType = DIALOG_OPTIONS;
+	_tempConfig = _madsVm->globals()->_config;
+
+	setFrame(2, 2);
+	initVars();
+
+	_vm->_font->setFont(FONT_CONVERSATION_MADS);
+	addLines();
+	setClickableLines();
 }
+
+void RexOptionsDialog::reload() {
+	for (int i = 0; i < DIALOG_LINES_SIZE; ++i)
+		_dialogText[i].in_use = false;
+	_totalTextEntries = 0;
+	_textDisplay.clear();
+	_screenObjects.clear();
+
+	initVars();
+
+	_vm->_font->setFont(FONT_CONVERSATION_MADS);
+	addLines();
+	setClickableLines();
+}
+
+void RexOptionsDialog::addLines() {
+	// Add the title
+	int top = MADS_Y_OFFSET - 2 - ((((_vm->_font->getHeight() + 1) * 9 + 12) >> 1) - 78);
+
+	addQuote(_vm->_font, ALIGN_CENTER, 0, top, 16);
+
+	// Music state line
+	top += _vm->_font->getHeight() + 1 + 6;
+	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 17, _tempConfig.musicFlag ? 24 : 25);
+
+	// Sound state line
+	top += _vm->_font->getHeight() + 1;
+	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 18, _tempConfig.soundFlag ? 26 : 27);
+
+	// Interface easy state line
+	top += _vm->_font->getHeight() + 1;
+	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 19, _tempConfig.easyMouse ? 29 : 28);
+
+	// Inventory sppinng state line
+	top += _vm->_font->getHeight() + 1;
+	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 20, _tempConfig.invObjectsStill ? 31 : 30);
+
+	// Text window state line
+	top += _vm->_font->getHeight() + 1;
+	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 21, _tempConfig.textWindowStill ? 33 : 32);
+
+	// Screen fade state line
+	top += _vm->_font->getHeight() + 1;
+	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 22, _tempConfig.screenFades + 34);
+
+	// Storyline mode line
+	top += _vm->_font->getHeight() + 1;
+	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 23, (_tempConfig.storyMode == 1) ? 37 : 38);
+
+	// Add Done and Cancel button texts
+	top += _vm->_font->getHeight() + 1 + 6;
+	addQuote(_vm->_font, ALIGN_CENTER, -54, top, 1, 0);
+	addQuote(_vm->_font, ALIGN_CENTER, 54, top, 2, 0);
+}
+
+bool RexOptionsDialog::onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents) {
+	// Call the parent event handler to handle line selection
+	bool handled = RexDialogView::onEvent(eventType, param1, x, y, captureEvents);
+
+	if (_selectedLine > 0) {
+		switch (_selectedLine) {
+		case 0:
+			// Enter or Escape
+			_selectedLine = _enterFlag ? 8 : 9;
+			return true;
+		case 1:
+			// Music line
+			_tempConfig.musicFlag = !_tempConfig.musicFlag;
+			break;
+		case 2:
+			// Sound line
+			_tempConfig.soundFlag = !_tempConfig.soundFlag;
+			break;
+		case 3:
+			// Interface line
+			_tempConfig.easyMouse = !_tempConfig.easyMouse;
+			break;
+		case 4:
+			// Inventory line
+			_tempConfig.invObjectsStill = !_tempConfig.invObjectsStill;
+			break;
+		case 5:
+			// Text window line
+			_tempConfig.textWindowStill = !_tempConfig.textWindowStill;
+			break;
+		case 6:
+			// Screen fades line
+			if (++_tempConfig.screenFades > 2)
+				_tempConfig.screenFades = 0;
+			break;
+		case 7:
+			// Story mode line
+			if (_tempConfig.storyMode == 2)
+				_tempConfig.storyMode = 1;
+			else if (_tempConfig.storyMode == 1)
+				_tempConfig.storyMode = 2;
+			break;
+		case 8:
+		case 9:
+			// Done and Cancel buttons
+			// TODO: Proper re-loading of settings if Cancel button clicked
+			_madsVm->globals()->_config = _tempConfig;
+
+			// Closing the dialog, so return to the game menu
+			_madsVm->globals()->dialogType = DIALOG_GAME_MENU;
+			_madsVm->_viewManager->deleteView(this);
+			return true;
+		}
+
+		// Update the option selections 
+		reload();
+	}
+
+	return handled;
+}
+
+}

Modified: scummvm/trunk/engines/m4/mads_menus.h
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.h	2010-03-27 07:14:52 UTC (rev 48409)
+++ scummvm/trunk/engines/m4/mads_menus.h	2010-03-27 10:44:38 UTC (rev 48410)
@@ -158,10 +158,21 @@
 public:
 	RexGameMenuDialog();
 
-	virtual void onRefresh(RectList *rects, M4Surface *destSurface);
 	virtual bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
 };
 
+class RexOptionsDialog : public RexDialogView {
+private:
+	MadsConfigData _tempConfig;
+
+	void reload();
+	void addLines();
+public:
+	RexOptionsDialog();
+
+	virtual bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
+};
+
 }
 
 #endif

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-03-27 07:14:52 UTC (rev 48409)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-03-27 10:44:38 UTC (rev 48410)
@@ -131,6 +131,11 @@
 	}
 }
 
+void MadsTextDisplay::clear() {
+	for (int i = 0; i < TEXT_DISPLAY_SIZE; ++i)
+		_entries[i].active = false;
+}
+
 int MadsTextDisplay::add(int xp, int yp, uint fontColour, int charSpacing, const char *msg, Font *font) {
 	int usedSlot = -1;
 
@@ -433,8 +438,8 @@
 		M4Sprite *spr = _objectSprites->getFrame(_objectFrameNumber / INV_ANIM_FRAME_SPEED);
 		spr->copyTo(destSurface, INVENTORY_X, INVENTORY_Y, 0);
 
-		if (!_madsVm->globals()->invObjectsStill && !dialogVisible) {
-			// If objetcs are to animated, move to the next frame
+		if (!_madsVm->globals()->_config.invObjectsStill && !dialogVisible) {
+			// If objects need to be animated, move to the next frame
 			if (++_objectFrameNumber >= (_objectSprites->getCount() * INV_ANIM_FRAME_SPEED))
 				_objectFrameNumber = 0;
 		}

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-03-27 07:14:52 UTC (rev 48409)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-03-27 10:44:38 UTC (rev 48410)
@@ -77,6 +77,10 @@
 
 	int getIndex();
 	void addSprites(const char *resName);
+	void clear() {
+		startIndex = 0;
+		_sprites.clear();
+	}
 
 	void draw(View *view);
 };
@@ -114,6 +118,7 @@
 	}
 
 	int add(int xp, int yp, uint fontColour, int charSpacing, const char *msg, Font *font);
+	void clear();
 	void draw(View *view);
 };
 


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

Revision: 48635
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48635&view=rev
Author:   dreammaster
Date:     2010-04-12 08:31:46 +0000 (Mon, 12 Apr 2010)

Log Message:
-----------
Added the beginnings of the main timer list

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

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-04-12 07:28:54 UTC (rev 48634)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-04-12 08:31:46 UTC (rev 48635)
@@ -77,7 +77,75 @@
 	return _madsVm->scene()->loadSceneSpriteSet(resName);
 }
 
+uint16 MadsSceneLogic::startSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks) {
+	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(1);
+	uint8 pixel = *_madsVm->scene()->getWalkSurface()->getBasePtr(spriteFrame->x + (spriteFrame->width() / 2),
+		spriteFrame->y + (spriteFrame->height() / 2));
 
+	return _madsVm->scene()->_timerList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
+		-1, 100, (int)pixel - 1, 1, 1, 0, 0);
+}
+
+uint16 MadsSceneLogic::startSpriteSequence2(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks) {
+	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(1);
+	uint8 pixel = *_madsVm->scene()->getWalkSurface()->getBasePtr(spriteFrame->x + (spriteFrame->width() / 2),
+		spriteFrame->y + (spriteFrame->height() / 2));
+
+	return _madsVm->scene()->_timerList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
+		-1, 100, (int)pixel - 1, 1, 2, 0, 0);
+}
+
+uint16 MadsSceneLogic::startSpriteSequence3(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks) {
+	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(1);
+	uint8 pixel = *_madsVm->scene()->getWalkSurface()->getBasePtr(spriteFrame->x + (spriteFrame->width() / 2),
+		spriteFrame->y + (spriteFrame->height() / 2));
+
+	return _madsVm->scene()->_timerList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
+		-1, 100, (int)pixel - 1, -1, 1, 0, 0);
+}
+
+void MadsSceneLogic::activateHotspot(int idx, bool active) {
+	// TODO:
+}
+
+void MadsSceneLogic::lowRoomsEntrySound() {
+	if (!_madsVm->globals()->_config.musicFlag) {
+		_madsVm->_sound->playSound(2);
+	} else {
+		// Play different sounds for each of the rooms
+		switch (_madsVm->globals()->sceneNumber) {
+		case 101:
+			_madsVm->_sound->playSound(11);
+			break;
+		case 102:
+			_madsVm->_sound->playSound(12);
+			break;
+		case 103:
+			_madsVm->_sound->playSound(3);
+			_madsVm->_sound->playSound(25);
+			break;
+		case 104:
+			_madsVm->_sound->playSound(10);
+			break;
+		case 105:
+			if ((_madsVm->globals()->previousScene < 104) || (_madsVm->globals()->previousScene > 108))
+				_madsVm->_sound->playSound(10);
+			break;
+		case 106:
+			_madsVm->_sound->playSound(13);
+			break;
+		case 107:
+			_madsVm->_sound->playSound(3);
+			break;
+		case 108:
+			_madsVm->_sound->playSound(15);
+			break;
+		default:
+			break;
+		}
+	}
+}
+
 /*--------------------------------------------------------------------------*/
 
 /**
@@ -114,6 +182,33 @@
 	_spriteIndexes[11] = loadSpriteSet(1, 'a');
 	_spriteIndexes[12] = loadSpriteSet(8, 'x');
 	_spriteIndexes[13] = loadSpriteSet(0, 'x');
+
+	_spriteIndexes[15] = startSpriteSequence(_spriteIndexes[0], 0, 5, 0, 0, 25);
+	_spriteIndexes[16] = startSpriteSequence(_spriteIndexes[1], 0, 4, 0, 1, 0);
+	_spriteIndexes[17] = startSpriteSequence(_spriteIndexes[2], 0, 4, 0, 1, 0);
+
+	_madsVm->scene()->_timerList.unk2(0, 2, 7, 0x46);
+
+	_spriteIndexes[18] = startSpriteSequence2(_spriteIndexes[3], 0, 10, 0, 0, 60);
+	_spriteIndexes[19] = startSpriteSequence(_spriteIndexes[4], 0, 5, 0, 1, 0);
+	_spriteIndexes[20] = startSpriteSequence(_spriteIndexes[5], 0, 10, 0, 2, 0);
+	_spriteIndexes[21] = startSpriteSequence(_spriteIndexes[6], 0, 6, 0, 0, 0);
+
+	_spriteIndexes[23] = startSpriteSequence(_spriteIndexes[8], 0, 6, 0, 10, 4);
+	_spriteIndexes[24] = startSpriteSequence(_spriteIndexes[9], 0, 6, 0, 32, 47);
+
+	activateHotspot(0x137, false);		// SHIELD MODULATOR
+	// shield_panel_opened = 0;
+
+	if (_madsVm->globals()->previousScene != -1)
+		_madsVm->globals()->_globals[10] = 0;
+	if (_madsVm->globals()->previousScene != -2) {
+		//playerPos = (100, 152);
+	}
+	
+	// TODO: EXTRA STUFF
+
+	lowRoomsEntrySound();
 }
 
 void MadsSceneLogic::doAction() {

Modified: scummvm/trunk/engines/m4/mads_logic.h
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.h	2010-04-12 07:28:54 UTC (rev 48634)
+++ scummvm/trunk/engines/m4/mads_logic.h	2010-04-12 08:31:46 UTC (rev 48635)
@@ -35,9 +35,14 @@
 private:
 	// Library interface methods
 	uint16 loadSpriteSet(uint16 suffixNum, uint16 sepChar);
+	uint16 startSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks);
+	uint16 startSpriteSequence2(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks);
+	uint16 startSpriteSequence3(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks);
+	void activateHotspot(int idx, bool active);
+	void lowRoomsEntrySound();
 private:
 	int _sceneNumber;
-	uint16 _spriteIndexes[50];
+	int16 _spriteIndexes[50];
 
 	// Support functions
 	const char *formAnimName(char sepChar, int16 suffixNum);

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-04-12 07:28:54 UTC (rev 48634)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-04-12 08:31:46 UTC (rev 48635)
@@ -44,7 +44,6 @@
 	_vm = vm;
 
 	_interfaceSurface = new MadsInterfaceView(vm);
-	_spriteSlotsStart = 0;
 	for (int i = 0; i < 3; ++i)
 		actionNouns[i] = 0;
 }
@@ -158,11 +157,6 @@
 
 	delete _sceneResources.hotspots;
 	delete _sceneResources.props;
-
-	// Delete the sprites
-	for (uint i = 0; i <_sceneSprites.size(); ++i) delete _sceneSprites[i];
-	_sceneSprites.clear();
-
 	delete _walkSurface;
 
 	Scene::leaveScene();
@@ -269,13 +263,9 @@
  * Draws all the elements of the scene
  */
 void MadsScene::drawElements() {
-	
 	// Display animations
-	for (int idx = 0; idx < _spriteSlotsStart; ++idx) {
-		
-	}
+	_spriteSlots.draw(this);
 
-
 	// Text display 
 	_textDisplay.draw(this);
 
@@ -283,17 +273,6 @@
 	_interfaceSurface->copyTo(this, 0, this->height() - _interfaceSurface->height());
 
 /*
-	// At this point, in the original engine, the dirty/changed areas were copied to the screen. At the moment,
-	// the current M4 engine framework doesn't support dirty areas, but this is being kept in case that ever changes
-	for (int idx = 0; idx < DIRTY_AREA_SIZE; ++idx) {
-		if (_dirtyAreas[idx].active && _dirtyAreas[idx].active2 && 
-			(_dirtyAreas[idx].bounds.width() > 0) && (_dirtyAreas[idx].bounds.height() > 0)) {
-			// Copy changed area to screen
-
-		}
-	}
-*/
-
 	// Some kind of copying over of slot entries
 	for (int idx = 0, idx2 = 0; idx < _spriteSlotsStart; ++idx) {
 		if (_spriteSlots[idx].spriteId >= 0) {
@@ -303,7 +282,7 @@
 			}
 			++idx2;
 		}
-	}
+	}*/
 }
 
 
@@ -330,7 +309,7 @@
 	}
 
 	//***DEBUG***
-	_sceneSprites[0]->getFrame(1)->copyTo(this, 120, 90, 0);
+	_spriteSlots.getSprite(0).getFrame(1)->copyTo(this, 120, 90, 0);
 }
 
 int MadsScene::loadSceneSpriteSet(const char *setName) {
@@ -341,13 +320,7 @@
 	if (!strchr(resName, '.'))
 		strcat(resName, ".SS");
 
-	Common::SeekableReadStream *data = _vm->res()->get(resName);
-	SpriteAsset *spriteSet = new SpriteAsset(_vm, data, data->size(), resName);
-	spriteSet->translate(_vm->_palette);
-	_vm->res()->toss(resName);
-
-	_sceneSprites.push_back(spriteSet);
-	return _sceneSprites.size() - 1;
+	return _spriteSlots.addSprites(resName);
 }
 
 void MadsScene::loadPlayerSprites(const char *prefix) {
@@ -646,6 +619,79 @@
 
 /*--------------------------------------------------------------------------*/
 
+MadsTimerList::MadsTimerList() {
+	for (int i = 0; i < TIMER_LIST_SIZE; ++i) {
+		MadsTimerEntry rec;
+		rec.active = 0;
+		rec.walkObjectIndex = -1;
+		_entries.push_back(rec);
+	}
+}
+
+bool MadsTimerList::unk2(int index, int v1, int v2, int v3) {
+	if (_entries[index].len27 >= TIMER_ENTRY_SUBSET_MAX)
+		return true;
+
+	int subIndex = _entries[index].len27++;
+	_entries[index].fld27[subIndex] = v1;
+	_entries[index].fld2C[subIndex] = v2;
+	_entries[index].field36 = v3;
+
+	return false;
+}
+
+int MadsTimerList::add(int spriteListIndex, int v0, int frameIndex, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
+		int height, int width, char field_12, char scale, char depth, int field_C, int field_A, int numSprites, 
+		int spriteNum) {
+
+	// Find a free slot
+	uint timerIndex = 0;
+	while ((timerIndex < _entries.size()) && (_entries[timerIndex].active))
+		++timerIndex;
+	if (timerIndex == _entries.size())
+		error("TimerList full");
+
+	if (spriteNum <= 0)
+		spriteNum = 1;
+	if (numSprites == 0)
+		numSprites = _madsVm->scene()->_spriteSlots.getSprite(spriteListIndex).getCount();
+	if (spriteNum == numSprites)
+		field_C = 0;
+
+	// Set the list entry fields
+	_entries[timerIndex].active = true;
+	_entries[timerIndex].spriteListIndex = spriteListIndex;
+	_entries[timerIndex].field_2 = v0;
+	_entries[timerIndex].frameIndex = frameIndex;
+	_entries[timerIndex].spriteNum = spriteNum;
+	_entries[timerIndex].numSprites = numSprites;
+	_entries[timerIndex].field_A = field_A;
+	_entries[timerIndex].field_C = field_C;
+	_entries[timerIndex].depth = depth;
+	_entries[timerIndex].scale = scale;
+	_entries[timerIndex].field_12 = field_12;
+	_entries[timerIndex].width = width;
+	_entries[timerIndex].height = height;
+	_entries[timerIndex].numTicks = numTicks;
+	_entries[timerIndex].extraTicks = extraTicks;
+
+	_entries[timerIndex].timeout = g_system->getMillis() + timeoutTicks * GAME_FRAME_DELAY;
+
+	_entries[timerIndex].field_24 = field_24;
+	_entries[timerIndex].field_25 = 0;
+	_entries[timerIndex].field_13 = 0;
+	_entries[timerIndex].walkObjectIndex = -1;
+	_entries[timerIndex].len27 = 0;
+	_entries[timerIndex].field_3B = 0; //word_84206
+
+	for (int i = 0; i < 3; ++i)
+		_entries[timerIndex].actionNouns[i] = _madsVm->scene()->actionNouns[i];
+
+	return timerIndex;
+}
+
+/*--------------------------------------------------------------------------*/
+
 void MadsSceneResources::load(int sId) {
 	const char *sceneInfoStr = MADSResourceManager::getResourceName(RESPREFIX_RM, sId, ".DAT");
 	Common::SeekableReadStream *rawStream = _vm->_resourceManager->get(sceneInfoStr);
@@ -687,45 +733,10 @@
 
 /*--------------------------------------------------------------------------*/
 
-MadsScreenText::MadsScreenText() {
-	for (int i = 0; i < OLD_TEXT_DISPLAY_SIZE; ++i)
-		_textDisplay[i].active = false;
-	for (int i = 0; i < TIMED_TEXT_SIZE; ++i)
-		_timedText[i].flags = 0;
-	_abortTimedText = false;
-}
-
 /**
- * Adds the specified string to the list of on-screen display text
- */
-int MadsScreenText::add(const Common::Point &destPos, uint fontColours, int widthAdjust, const char *msg, Font *font) {
-	// Find a free slot
-	int idx = 0;
-	while ((idx < OLD_TEXT_DISPLAY_SIZE) && _textDisplay[idx].active)
-		++idx;
-	if (idx == OLD_TEXT_DISPLAY_SIZE)
-		error("Ran out of text display slots");
-
-	// Set up the entry values
-	_textDisplay[idx].active = true;
-	_textDisplay[idx].active2 = 1;
-	_textDisplay[idx].bounds.left = destPos.x;
-	_textDisplay[idx].bounds.top = destPos.y;
-	_textDisplay[idx].bounds.setWidth(font->getWidth(msg, widthAdjust));
-	_textDisplay[idx].bounds.setHeight(font->getHeight());
-	_textDisplay[idx].font = font;
-	strncpy(_textDisplay[idx].message, msg, 100);
-	_textDisplay[idx].message[99] = '\0';
-	_textDisplay[idx].colour1 = fontColours & 0xff;
-	_textDisplay[idx].colour2 = fontColours >> 8;
-	_textDisplay[idx].spacing = widthAdjust;
-
-	return idx;
-}
-
-/**
  * Adds a new entry to the timed on-screen text display list
  */
+/*
 int MadsScreenText::addTimed(const Common::Point &destPos, uint fontColours, uint flags, int vUnknown, uint32 timeout, const char *message) {
 	// Find a free slot
 	int idx = 0;
@@ -749,7 +760,7 @@
 	_timedText[idx].timeout = timeout;
 	_timedText[idx].frameTimer = g_system->getMillis();
 	_timedText[idx].field_1C = vUnknown;
-	_timedText[idx].field_1D = 0; /* word_84206 */
+	_timedText[idx].field_1D = 0; // word_84206
 
 	// Copy the current action noun list
 	for (int i = 0; i < 3; ++i)
@@ -762,9 +773,6 @@
 	return idx;
 }
 
-/**
- * Draws any text display entries to the screen
- */
 void MadsScreenText::draw(M4Surface *surface) {
 }
 
@@ -811,5 +819,6 @@
 
 	// TODO: code from 'loc_244ec' onwards
 }
+*/
 
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	2010-04-12 07:28:54 UTC (rev 48634)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-04-12 08:31:46 UTC (rev 48635)
@@ -65,29 +65,18 @@
 };
 
 #define TIMED_TEXT_SIZE 10
-#define OLD_TEXT_DISPLAY_SIZE 40
 #define TEXT_4A_SIZE 30
 
 enum TalkTextFlags {TEXTFLAG_2 = 2, TEXTFLAG_4 = 4, TEXTFLAG_8 = 8, TEXTFLAG_40 = 0x40,
 		TEXTFLAG_ACTIVE = 0x80};
 
-struct TextDisplay {
-	bool active;
-	int spacing;
-	int16 active2;
-	Common::Rect bounds;
-	int colour1, colour2;
-	Font *font;
-	char message[100];
-};
-
 struct TimedText {
 	uint8 flags;
 	int colour1;
 	int colour2;
 	Common::Point position;
 	int textDisplayIndex;
-	int unk4AIndex;
+	int timerIndex;
 	uint32 timeout;
 	uint32 frameTimer;
 	bool field_1C;
@@ -96,30 +85,58 @@
 	char message[100];
 };
 
-struct Text4A {
-	uint8 active;
-	uint8 field25;
+#define TIMER_ENTRY_SUBSET_MAX 5
+
+struct MadsTimerEntry {
+	int8 active;
+	int8 spriteListIndex;
+	
+	int field_2;
+	
+	int frameIndex;
+	int spriteNum;
+	int numSprites;
+	
+	int field_A;
+	int field_C;
+
+	int depth;
+	int scale;
+	int walkObjectIndex;
+
+	int field_12;
+	int field_13;
+	
+	int width;
+	int height;
+	
+	int field_24;
+	int field_25;
+	int len27;
+	int8 fld27[TIMER_ENTRY_SUBSET_MAX];
+	int16 fld2C[TIMER_ENTRY_SUBSET_MAX];
+	int8 field36;
+	int field_3B;
+
+	uint16 actionNouns[3];
+	int numTicks;
+	int extraTicks;
+	int32 timeout;
 };
 
-class MadsScreenText {
+#define TIMER_LIST_SIZE 30
+
+class MadsTimerList {
 private:
-	TextDisplay _textDisplay[OLD_TEXT_DISPLAY_SIZE];
-	TimedText _timedText[TIMED_TEXT_SIZE];
-	Text4A _text4A[TEXT_4A_SIZE];
-	bool _abortTimedText;
-
-	void addTimedText(TimedText *entry);
+	Common::Array<MadsTimerEntry> _entries;
 public:
-	MadsScreenText();
+	MadsTimerList();
 
-	// TextDisplay list
-	int add(const Common::Point &destPos, uint fontColours, int widthAdjust, const char *msg, Font *font);
-	void setActive2(int16 idx) { _textDisplay[idx].active2 = -1; }
-	// TimedText list
-	int addTimed(const Common::Point &destPos, uint fontColours, uint flags, int vUnknown, uint32 timeout, const char *message);
-
-	void draw(M4Surface *surface);
-	void timedDisplay();
+	MadsTimerEntry &operator[](int index) { return _entries[index]; }	
+	bool unk2(int index, int v1, int v2, int v3);
+	int add(int spriteListIndex, int v0, int v1, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
+		int height, int width, char field_12, char scale, char depth, int field_C, int field_A, 
+		int numSprites, int spriteNum);
 };
 
 enum MadsActionMode {ACTMODE_NONE = 0, ACTMODE_VERB = 1, ACTMODE_OBJECT = 3, ACTMODE_TALK = 6};
@@ -157,9 +174,6 @@
 	const char *statusText() const { return _statusText; }
 };
 
-typedef Common::Array<SpriteAsset *> SpriteAssetArray;
-
-#define SPRITE_SLOTS_SIZE 50
 #define DIRTY_AREA_SIZE 90
 
 class MadsScene : public Scene {
@@ -170,11 +184,7 @@
 
 	MadsSceneLogic _sceneLogic;
 	SpriteAsset *_playerSprites;
-	SpriteAssetArray _sceneSprites;
-	SpriteSlot _spriteSlots[50];
-	MadsScreenText _textDisplay;
 	DirtyArea _dirtyAreas[DIRTY_AREA_SIZE];
-	int _spriteSlotsStart;
 
 	void drawElements();
 	void loadScene2(const char *aaName);
@@ -186,6 +196,7 @@
 public:
 	char _aaName[100];
 	uint16 actionNouns[3];
+	MadsTimerList _timerList;
 public:
 	MadsScene(MadsEngine *vm);
 	virtual ~MadsScene();

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-04-12 07:28:54 UTC (rev 48634)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-04-12 08:31:46 UTC (rev 48635)
@@ -47,7 +47,7 @@
 	return startIndex++;
 }
 
-void MadsSpriteSlots::addSprites(const char *resName) {
+int MadsSpriteSlots::addSprites(const char *resName) {
 	// Get the sprite set
 	Common::SeekableReadStream *data = _vm->res()->get(resName);
 	SpriteAsset *spriteSet = new SpriteAsset(_vm, data, data->size(), resName);
@@ -56,7 +56,7 @@
 	_sprites.push_back(SpriteList::value_type(spriteSet));
 	_vm->res()->toss(resName);
 
-	// Translate the sprite set to the current palette
+	return _sprites.size() - 1;
 }
 
 class DepthEntry {

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-04-12 07:28:54 UTC (rev 48634)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-04-12 08:31:46 UTC (rev 48635)
@@ -76,7 +76,7 @@
 	}
 
 	int getIndex();
-	void addSprites(const char *resName);
+	int addSprites(const char *resName);
 	void clear() {
 		startIndex = 0;
 		_sprites.clear();
@@ -155,7 +155,7 @@
 
 
 class MadsView: public View {
-protected:
+public:
 	MadsSpriteSlots _spriteSlots;
 	MadsTextDisplay _textDisplay;
 	ScreenObjects _screenObjects;

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-04-12 07:28:54 UTC (rev 48634)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-04-12 08:31:46 UTC (rev 48635)
@@ -39,7 +39,7 @@
 
 namespace M4 {
 
-Scene::Scene(MadsM4Engine *vm, SceneResources *res): View(vm, Common::Rect(0, 0, vm->_screen->width(), 
+Scene::Scene(MadsM4Engine *vm, SceneResources *res): MadsView(vm, Common::Rect(0, 0, vm->_screen->width(), 
 			vm->_screen->height())), _sceneResources(res) {
 	_screenType = VIEWID_SCENE;
 

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-04-12 07:28:54 UTC (rev 48634)
+++ scummvm/trunk/engines/m4/scene.h	2010-04-12 08:31:46 UTC (rev 48635)
@@ -76,7 +76,7 @@
 class MadsEngine;
 class InterfaceView;
 
-class Scene : public View {
+class Scene : public MadsView {
 private:
 	HotSpotList _sceneHotspots;
 protected:
@@ -113,6 +113,7 @@
 	void hideInterface();
 	GameInterfaceView *getInterface() { return _interfaceSurface; }
 	SceneResources &getSceneResources() { return *_sceneResources; }
+	M4Surface *getWalkSurface() const { return _walkSurface; }
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
 	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);


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

Revision: 48763
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48763&view=rev
Author:   dreammaster
Date:     2010-04-21 10:42:01 +0000 (Wed, 21 Apr 2010)

Log Message:
-----------
Changed MadsView into a separate class, since it's functionality is needed by two different class hierarchies that can't share a common ancestor class

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

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-04-21 09:20:27 UTC (rev 48762)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-04-21 10:42:01 UTC (rev 48763)
@@ -586,7 +586,8 @@
  *--------------------------------------------------------------------------
  */
 
-RexDialogView::RexDialogView(): MadsView(_madsVm, Common::Rect(0, 0, _madsVm->_screen->width(), _madsVm->_screen->height())) {
+RexDialogView::RexDialogView(): View(_madsVm, Common::Rect(0, 0, _madsVm->_screen->width(), _madsVm->_screen->height())),
+		MadsView(this) {
 	_screenType = VIEWID_MENU;
 
 	// Initialise class variables
@@ -695,7 +696,10 @@
 	// Check whether any of the dialog text entries need to be refreshed
 	refreshText();
 
-	MadsView::onRefresh(rects, destSurface);
+	// Handle the drawing of the various Mads elements
+	refresh(rects);
+
+	View::onRefresh(rects, destSurface);
 }
 
 /**

Modified: scummvm/trunk/engines/m4/mads_menus.h
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.h	2010-04-21 09:20:27 UTC (rev 48762)
+++ scummvm/trunk/engines/m4/mads_menus.h	2010-04-21 10:42:01 UTC (rev 48763)
@@ -112,7 +112,7 @@
 enum MadsTextAlignment { ALIGN_CENTER = -1, ALIGN_CHAR_CENTER = -2, RIGHT_ALIGN = -3 };
 
 
-class RexDialogView : public MadsView {
+class RexDialogView : public View, public MadsView {
 private:
 	int _priorSceneId;
 

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-04-21 09:20:27 UTC (rev 48762)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-04-21 10:42:01 UTC (rev 48763)
@@ -40,7 +40,7 @@
 
 namespace M4 {
 
-MadsScene::MadsScene(MadsEngine *vm): _sceneResources(), Scene(vm, &_sceneResources) {
+MadsScene::MadsScene(MadsEngine *vm): _sceneResources(), Scene(vm, &_sceneResources), MadsView(this) {
 	_vm = vm;
 
 	_interfaceSurface = new MadsInterfaceView(vm);

Modified: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	2010-04-21 09:20:27 UTC (rev 48762)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-04-21 10:42:01 UTC (rev 48763)
@@ -27,6 +27,8 @@
 #define M4_MADS_SCENE_H
 
 #include "m4/scene.h"
+#include "m4/mads_logic.h"
+#include "m4/mads_views.h"
 
 namespace M4 {
 
@@ -176,7 +178,7 @@
 
 #define DIRTY_AREA_SIZE 90
 
-class MadsScene : public Scene {
+class MadsScene : public Scene, public MadsView {
 private:
 	MadsEngine *_vm;
 	MadsSceneResources _sceneResources;

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-04-21 09:20:27 UTC (rev 48762)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-04-21 10:42:01 UTC (rev 48763)
@@ -237,20 +237,12 @@
 
 //--------------------------------------------------------------------------
 
-MadsView::MadsView(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent): View(vm, viewBounds, transparent) {
-}
-
-MadsView::MadsView(MadsM4Engine *vm, int x, int y, bool transparent): View(vm, x, y, transparent) {
-}
-
-void MadsView::onRefresh(RectList *rects, M4Surface *destSurface) {
+void MadsView::refresh(RectList *rects) {
 	// Draw any sprites
-	_spriteSlots.draw(this);
+	_spriteSlots.draw(_view);
 
 	// Draw text elements onto the view
-	_textDisplay.draw(this);
-
-	View::onRefresh(rects, destSurface);
+	_textDisplay.draw(_view);
 }
 
 /*--------------------------------------------------------------------------

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-04-21 09:20:27 UTC (rev 48762)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-04-21 10:42:01 UTC (rev 48763)
@@ -154,16 +154,17 @@
 
 
 
-class MadsView: public View {
+class MadsView {
+private:
+	View *_view;
 public:
 	MadsSpriteSlots _spriteSlots;
 	MadsTextDisplay _textDisplay;
 	ScreenObjects _screenObjects;
 public:
-	MadsView(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent = false);
-	MadsView(MadsM4Engine *vm, int x = 0, int y = 0, bool transparent = false);
+	MadsView(View *view): _view(view) {}
 
-	void onRefresh(RectList *rects, M4Surface *destSurface);
+	void refresh(RectList *rects);
 };
 
 #define CHEAT_SEQUENCE_MAX 8

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-04-21 09:20:27 UTC (rev 48762)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-04-21 10:42:01 UTC (rev 48763)
@@ -39,7 +39,7 @@
 
 namespace M4 {
 
-Scene::Scene(MadsM4Engine *vm, SceneResources *res): MadsView(vm, Common::Rect(0, 0, vm->_screen->width(), 
+Scene::Scene(MadsM4Engine *vm, SceneResources *res): View(vm, Common::Rect(0, 0, vm->_screen->width(), 
 			vm->_screen->height())), _sceneResources(res) {
 	_screenType = VIEWID_SCENE;
 

Modified: scummvm/trunk/engines/m4/scene.h
===================================================================
--- scummvm/trunk/engines/m4/scene.h	2010-04-21 09:20:27 UTC (rev 48762)
+++ scummvm/trunk/engines/m4/scene.h	2010-04-21 10:42:01 UTC (rev 48763)
@@ -35,8 +35,6 @@
 #include "m4/viewmgr.h"
 #include "m4/gui.h"
 #include "m4/m4_views.h"
-#include "m4/mads_logic.h"
-#include "m4/mads_views.h"
 #include "common/array.h"
 
 namespace M4 {
@@ -76,7 +74,7 @@
 class MadsEngine;
 class InterfaceView;
 
-class Scene : public MadsView {
+class Scene : public View {
 private:
 	HotSpotList _sceneHotspots;
 protected:


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

Revision: 48776
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48776&view=rev
Author:   dreammaster
Date:     2010-04-23 10:28:30 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
Implemented extra timer methods and a DynamicHotspots class

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

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-04-22 18:12:25 UTC (rev 48775)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-04-23 10:28:30 UTC (rev 48776)
@@ -619,79 +619,6 @@
 
 /*--------------------------------------------------------------------------*/
 
-MadsTimerList::MadsTimerList() {
-	for (int i = 0; i < TIMER_LIST_SIZE; ++i) {
-		MadsTimerEntry rec;
-		rec.active = 0;
-		rec.walkObjectIndex = -1;
-		_entries.push_back(rec);
-	}
-}
-
-bool MadsTimerList::unk2(int index, int v1, int v2, int v3) {
-	if (_entries[index].len27 >= TIMER_ENTRY_SUBSET_MAX)
-		return true;
-
-	int subIndex = _entries[index].len27++;
-	_entries[index].fld27[subIndex] = v1;
-	_entries[index].fld2C[subIndex] = v2;
-	_entries[index].field36 = v3;
-
-	return false;
-}
-
-int MadsTimerList::add(int spriteListIndex, int v0, int frameIndex, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
-		int height, int width, char field_12, char scale, char depth, int field_C, int field_A, int numSprites, 
-		int spriteNum) {
-
-	// Find a free slot
-	uint timerIndex = 0;
-	while ((timerIndex < _entries.size()) && (_entries[timerIndex].active))
-		++timerIndex;
-	if (timerIndex == _entries.size())
-		error("TimerList full");
-
-	if (spriteNum <= 0)
-		spriteNum = 1;
-	if (numSprites == 0)
-		numSprites = _madsVm->scene()->_spriteSlots.getSprite(spriteListIndex).getCount();
-	if (spriteNum == numSprites)
-		field_C = 0;
-
-	// Set the list entry fields
-	_entries[timerIndex].active = true;
-	_entries[timerIndex].spriteListIndex = spriteListIndex;
-	_entries[timerIndex].field_2 = v0;
-	_entries[timerIndex].frameIndex = frameIndex;
-	_entries[timerIndex].spriteNum = spriteNum;
-	_entries[timerIndex].numSprites = numSprites;
-	_entries[timerIndex].field_A = field_A;
-	_entries[timerIndex].field_C = field_C;
-	_entries[timerIndex].depth = depth;
-	_entries[timerIndex].scale = scale;
-	_entries[timerIndex].field_12 = field_12;
-	_entries[timerIndex].width = width;
-	_entries[timerIndex].height = height;
-	_entries[timerIndex].numTicks = numTicks;
-	_entries[timerIndex].extraTicks = extraTicks;
-
-	_entries[timerIndex].timeout = g_system->getMillis() + timeoutTicks * GAME_FRAME_DELAY;
-
-	_entries[timerIndex].field_24 = field_24;
-	_entries[timerIndex].field_25 = 0;
-	_entries[timerIndex].field_13 = 0;
-	_entries[timerIndex].walkObjectIndex = -1;
-	_entries[timerIndex].len27 = 0;
-	_entries[timerIndex].field_3B = 0; //word_84206
-
-	for (int i = 0; i < 3; ++i)
-		_entries[timerIndex].actionNouns[i] = _madsVm->scene()->actionNouns[i];
-
-	return timerIndex;
-}
-
-/*--------------------------------------------------------------------------*/
-
 void MadsSceneResources::load(int sId) {
 	const char *sceneInfoStr = MADSResourceManager::getResourceName(RESPREFIX_RM, sId, ".DAT");
 	Common::SeekableReadStream *rawStream = _vm->_resourceManager->get(sceneInfoStr);

Modified: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	2010-04-22 18:12:25 UTC (rev 48775)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-04-23 10:28:30 UTC (rev 48776)
@@ -87,60 +87,6 @@
 	char message[100];
 };
 
-#define TIMER_ENTRY_SUBSET_MAX 5
-
-struct MadsTimerEntry {
-	int8 active;
-	int8 spriteListIndex;
-	
-	int field_2;
-	
-	int frameIndex;
-	int spriteNum;
-	int numSprites;
-	
-	int field_A;
-	int field_C;
-
-	int depth;
-	int scale;
-	int walkObjectIndex;
-
-	int field_12;
-	int field_13;
-	
-	int width;
-	int height;
-	
-	int field_24;
-	int field_25;
-	int len27;
-	int8 fld27[TIMER_ENTRY_SUBSET_MAX];
-	int16 fld2C[TIMER_ENTRY_SUBSET_MAX];
-	int8 field36;
-	int field_3B;
-
-	uint16 actionNouns[3];
-	int numTicks;
-	int extraTicks;
-	int32 timeout;
-};
-
-#define TIMER_LIST_SIZE 30
-
-class MadsTimerList {
-private:
-	Common::Array<MadsTimerEntry> _entries;
-public:
-	MadsTimerList();
-
-	MadsTimerEntry &operator[](int index) { return _entries[index]; }	
-	bool unk2(int index, int v1, int v2, int v3);
-	int add(int spriteListIndex, int v0, int v1, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
-		int height, int width, char field_12, char scale, char depth, int field_C, int field_A, 
-		int numSprites, int spriteNum);
-};
-
 enum MadsActionMode {ACTMODE_NONE = 0, ACTMODE_VERB = 1, ACTMODE_OBJECT = 3, ACTMODE_TALK = 6};
 enum MAdsActionMode2 {ACTMODE2_0 = 0, ACTMODE2_2 = 2, ACTMODE2_5 = 5};
 
@@ -198,7 +144,6 @@
 public:
 	char _aaName[100];
 	uint16 actionNouns[3];
-	MadsTimerList _timerList;
 public:
 	MadsScene(MadsEngine *vm);
 	virtual ~MadsScene();

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-04-22 18:12:25 UTC (rev 48775)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-04-23 10:28:30 UTC (rev 48776)
@@ -59,6 +59,16 @@
 	return _sprites.size() - 1;
 }
 
+/*
+ * Deletes the sprite slot with the given timer entry
+ */
+void MadsSpriteSlots::deleteTimer(int timerIndex) {
+	for (int idx = 0; idx < startIndex; ++idx) {
+		if (_entries[idx].timerIndex == timerIndex)
+			_entries[idx].spriteId = -1;
+	}
+}
+
 class DepthEntry {
 public:
 	int depth;
@@ -235,8 +245,227 @@
 	}
 }
 
+/*--------------------------------------------------------------------------*/
+
+DynamicHotspots::DynamicHotspots(MadsView &owner): _owner(owner) {
+	for (int i = 0; HITBOX_AREA_SIZE; ++i) {
+		DynamicHotspot rec;
+		rec.active = false;
+	}
+	_flag = true;
+	_count = 0;
+}
+
+int DynamicHotspots::add(int descId, int field14, int timerIndex, const Common::Rect &bounds) {
+	// Find a free slot
+	uint idx = 0;
+	while ((idx < _entries.size()) && !_entries[idx].active)
+		++idx;
+	if (idx == _entries.size())
+		error("DynamicHotspots overflow");
+
+	_entries[idx].active = true;
+	_entries[idx].descId = descId;
+	_entries[idx].bounds = bounds;
+	_entries[idx].pos.x = -3;
+	_entries[idx].pos.y = 0;
+	_entries[idx].facing = 5;
+	_entries[idx].field_14 = field14;
+	_entries[idx].articleNumber = 6;
+	_entries[idx].field_17 = 0;
+
+	++_count;
+	_flag = true;
+	_owner._timerList[timerIndex].dynamicHotspotIndex = idx;
+
+	return idx;
+}
+
+int DynamicHotspots::setPosition(int index, int xp, int yp, int facing) {
+	if (index >= 0) {
+		_entries[index].pos.x = xp;
+		_entries[index].pos.y = yp;
+		_entries[index].facing = facing;
+	}
+
+	return index;
+}
+
+int DynamicHotspots::set17(int index, int v) {
+	if (index >= 0)
+		_entries[index].field_17 = v;
+
+	return index;
+}
+
+void DynamicHotspots::remove(int index) {
+	if (_entries[index].active) {
+		if (_entries[index].timerIndex >= 0)
+			_owner._timerList[_entries[index].timerIndex].dynamicHotspotIndex = -1;
+		_entries[index].active = false;
+
+		--_count;
+		_flag = true;
+	}
+}
+
+void DynamicHotspots::reset() {
+	for (uint i = 0; i < _entries.size(); ++i)
+		_entries[i].active = false;
+
+	_count = 0;
+	_flag = false;
+}
+
+/*--------------------------------------------------------------------------*/
+
+MadsTimerList::MadsTimerList(MadsView &owner): _owner(owner) {
+	for (int i = 0; i < TIMER_LIST_SIZE; ++i) {
+		MadsTimerEntry rec;
+		rec.active = 0;
+		rec.dynamicHotspotIndex = -1;
+		_entries.push_back(rec);
+	}
+}
+
+bool MadsTimerList::unk2(int index, int v1, int v2, int v3) {
+	if (_entries[index].len27 >= TIMER_ENTRY_SUBSET_MAX)
+		return true;
+
+	int subIndex = _entries[index].len27++;
+	_entries[index].fld27[subIndex] = v1;
+	_entries[index].fld2C[subIndex] = v2;
+	_entries[index].field36 = v3;
+
+	return false;
+}
+
+int MadsTimerList::add(int spriteListIndex, int v0, int frameIndex, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
+		int height, int width, char field_12, char scale, char depth, int field_C, int field_A, int numSprites, 
+		int spriteNum) {
+
+	// Find a free slot
+	uint timerIndex = 0;
+	while ((timerIndex < _entries.size()) && (_entries[timerIndex].active))
+		++timerIndex;
+	if (timerIndex == _entries.size())
+		error("TimerList full");
+
+	if (spriteNum <= 0)
+		spriteNum = 1;
+	if (numSprites == 0)
+		numSprites = _madsVm->scene()->_spriteSlots.getSprite(spriteListIndex).getCount();
+	if (spriteNum == numSprites)
+		field_C = 0;
+
+	// Set the list entry fields
+	_entries[timerIndex].active = true;
+	_entries[timerIndex].spriteListIndex = spriteListIndex;
+	_entries[timerIndex].field_2 = v0;
+	_entries[timerIndex].frameIndex = frameIndex;
+	_entries[timerIndex].spriteNum = spriteNum;
+	_entries[timerIndex].numSprites = numSprites;
+	_entries[timerIndex].field_A = field_A;
+	_entries[timerIndex].field_C = field_C;
+	_entries[timerIndex].depth = depth;
+	_entries[timerIndex].scale = scale;
+	_entries[timerIndex].field_12 = field_12;
+	_entries[timerIndex].width = width;
+	_entries[timerIndex].height = height;
+	_entries[timerIndex].numTicks = numTicks;
+	_entries[timerIndex].extraTicks = extraTicks;
+
+	_entries[timerIndex].timeout = g_system->getMillis() + timeoutTicks * GAME_FRAME_DELAY;
+
+	_entries[timerIndex].field_24 = field_24;
+	_entries[timerIndex].field_25 = 0;
+	_entries[timerIndex].field_13 = 0;
+	_entries[timerIndex].dynamicHotspotIndex = -1;
+	_entries[timerIndex].len27 = 0;
+	_entries[timerIndex].field_3B = 0; //word_84206
+
+	for (int i = 0; i < 3; ++i)
+		_entries[timerIndex].actionNouns[i] = _madsVm->scene()->actionNouns[i];
+
+	return timerIndex;
+}
+
+void MadsTimerList::remove(int timerIndex) {
+	if (_entries[timerIndex].active) {
+		if (_entries[timerIndex].dynamicHotspotIndex >= 0)
+			_owner._dynamicHotspots.remove(_entries[timerIndex].dynamicHotspotIndex);
+	}
+
+	_entries[timerIndex].active = false;
+	_owner._spriteSlots.deleteTimer(timerIndex);
+}
+
+void MadsTimerList::setSpriteSlot(int timerIndex, MadsSpriteSlot &spriteSlot) {
+	MadsTimerEntry &timerEntry = _entries[timerIndex];
+	SpriteAsset &sprite = _owner._spriteSlots.getSprite(timerEntry.spriteListIndex);
+
+	// TODO: Figure out logic for spriteId value based on SPRITE_SLOT.field_0
+	spriteSlot.spriteId = (0 /*field 0*/ == 1) ? 0xFFFC : 1;
+	spriteSlot.timerIndex = timerIndex;
+	spriteSlot.spriteListIndex = timerEntry.spriteListIndex;
+	spriteSlot.frameNumber = ((timerEntry.field_2 == 1) ? 0x8000 : 0) | timerEntry.frameIndex;
+	spriteSlot.depth = timerEntry.depth;
+	spriteSlot.scale = timerEntry.scale;
+	
+	if (timerEntry.field_12 == 0) {
+		spriteSlot.xp = timerEntry.width;
+		spriteSlot.yp = timerEntry.height;
+	} else {
+		spriteSlot.xp = sprite.getFrame(timerEntry.frameIndex)->x;
+		spriteSlot.yp = sprite.getFrame(timerEntry.frameIndex)->y;
+	}
+}
+
+bool MadsTimerList::loadSprites(int timerIndex) {
+	MadsTimerEntry &timerEntry = _entries[timerIndex];
+
+	_owner._spriteSlots.deleteTimer(timerIndex);
+	if (timerEntry.field_25 != 0) {
+		remove(timerIndex);
+		return false;
+	}
+
+	// TODO: Rest of method
+
+	return true;
+}
+
+/**
+ * Handles counting down entries in the timer list for action
+ */
+void MadsTimerList::tick() {
+	for (uint idx = 0; idx < _entries.size(); ++idx) {
+		if ((_owner._abortTimers2 == 0) && (_owner._abortTimers != 0))
+			break;
+
+		MadsTimerEntry &timerEntry = _entries[idx];
+		uint32 currentTimer = g_system->getMillis();
+
+		if (!timerEntry.active || (currentTimer < timerEntry.timeout))
+			continue;
+
+		// Set the next timeout for the timer entry
+		timerEntry.timeout = currentTimer + timerEntry.numTicks;		
+
+		// Action the sprite
+		if (loadSprites(idx)) {
+			timerEntry.timeout += timerEntry.extraTicks;
+		}
+	}
+}
+
 //--------------------------------------------------------------------------
 
+MadsView::MadsView(View *view): _view(view), _dynamicHotspots(*this), _timerList(*this) {
+	_abortTimers = 0;
+	_abortTimers2 = 0;
+}
+
 void MadsView::refresh(RectList *rects) {
 	// Draw any sprites
 	_spriteSlots.draw(_view);

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-04-22 18:12:25 UTC (rev 48775)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-04-23 10:28:30 UTC (rev 48776)
@@ -38,6 +38,7 @@
 #define MADS_SCREEN_HEIGHT 200
 #define MADS_Y_OFFSET ((MADS_SCREEN_HEIGHT - MADS_SURFACE_HEIGHT) / 2)
 
+class MadsView;
 
 class MadsSpriteSlot {
 public:
@@ -81,6 +82,7 @@
 		startIndex = 0;
 		_sprites.clear();
 	}
+	void deleteTimer(int timerIndex);
 
 	void draw(View *view);
 };
@@ -152,8 +154,99 @@
 	void setActive(int category, int idx, bool active);
 };
 
+class DynamicHotspot {
+public:
+	bool active;
+	int timerIndex;
+	Common::Rect bounds;
+	Common::Point pos;
+	int facing;
+	int descId;
+	int field_14;
+	int articleNumber;
+	int field_17;
 
+	DynamicHotspot() { active = false; }
+};
 
+#define HITBOX_AREA_SIZE 8
+
+class DynamicHotspots {
+private:
+	MadsView &_owner;
+	Common::Array<DynamicHotspot> _entries;
+	bool _flag;
+	int _count;
+public:
+	DynamicHotspots(MadsView &owner);
+
+	DynamicHotspot &operator[](uint idx) { return _entries[idx]; }
+	int add(int descId, int field14, int timerIndex, const Common::Rect &bounds);
+	int setPosition(int index, int xp, int yp, int facing);
+	int set17(int index, int v);
+	void remove(int index);
+	void reset();
+};
+
+#define TIMER_ENTRY_SUBSET_MAX 5
+
+struct MadsTimerEntry {
+	int8 active;
+	int8 spriteListIndex;
+	
+	int field_2;
+	
+	int frameIndex;
+	int spriteNum;
+	int numSprites;
+	
+	int field_A;
+	int field_C;
+
+	int depth;
+	int scale;
+	int dynamicHotspotIndex;
+
+	int field_12;
+	int field_13;
+	
+	int width;
+	int height;
+	
+	int field_24;
+	int field_25;
+	int len27;
+	int8 fld27[TIMER_ENTRY_SUBSET_MAX];
+	int16 fld2C[TIMER_ENTRY_SUBSET_MAX];
+	int8 field36;
+	int field_3B;
+
+	uint16 actionNouns[3];
+	int numTicks;
+	int extraTicks;
+	uint32 timeout;
+};
+
+#define TIMER_LIST_SIZE 30
+
+class MadsTimerList {
+private:
+	MadsView &_owner;
+	Common::Array<MadsTimerEntry> _entries;
+public:
+	MadsTimerList(MadsView &owner);
+
+	MadsTimerEntry &operator[](int index) { return _entries[index]; }	
+	bool unk2(int index, int v1, int v2, int v3);
+	int add(int spriteListIndex, int v0, int v1, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
+		int height, int width, char field_12, char scale, char depth, int field_C, int field_A, 
+		int numSprites, int spriteNum);
+	void remove(int timerIndex);
+	void setSpriteSlot(int timerIndex, MadsSpriteSlot &spriteSlot);
+	bool loadSprites(int timerIndex);
+	void tick();
+};
+
 class MadsView {
 private:
 	View *_view;
@@ -161,8 +254,13 @@
 	MadsSpriteSlots _spriteSlots;
 	MadsTextDisplay _textDisplay;
 	ScreenObjects _screenObjects;
+	DynamicHotspots _dynamicHotspots;
+	MadsTimerList _timerList;
+
+	int _abortTimers;
+	int8 _abortTimers2;
 public:
-	MadsView(View *view): _view(view) {}
+	MadsView(View *view);
 
 	void refresh(RectList *rects);
 };


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

Revision: 48816
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48816&view=rev
Author:   dreammaster
Date:     2010-04-27 11:23:27 +0000 (Tue, 27 Apr 2010)

Log Message:
-----------
Added further timer method implementation. Also renamed some of the classes to match those of the original engine, based on the contents of various in-game error messages

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

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2010-04-27 11:14:25 UTC (rev 48815)
+++ scummvm/trunk/engines/m4/m4.cpp	2010-04-27 11:23:27 UTC (rev 48816)
@@ -493,6 +493,7 @@
 	_madsVm = this;
 
 	_globals = new MadsGlobals(this);
+	_currentTimer = 0;
 }
 
 MadsEngine::~MadsEngine() {
@@ -582,7 +583,8 @@
 
 		if (g_system->getMillis() >= nextFrame) {
 			_viewManager->refreshAll();
-			nextFrame = g_system->getMillis();// + GAME_FRAME_DELAY;
+			nextFrame = g_system->getMillis() + GAME_FRAME_DELAY;
+			++_currentTimer;
 		}
 
 		g_system->delayMillis(10);

Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h	2010-04-27 11:14:25 UTC (rev 48815)
+++ scummvm/trunk/engines/m4/m4.h	2010-04-27 11:23:27 UTC (rev 48816)
@@ -210,6 +210,7 @@
 	void showDialog();
 public:
 	MadsConversation _converse;
+	uint32 _currentTimer;
 public:
 	MadsEngine(OSystem *syst, const M4GameDescription *gameDesc);
 	virtual ~MadsEngine();

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-04-27 11:14:25 UTC (rev 48815)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-04-27 11:23:27 UTC (rev 48816)
@@ -82,7 +82,7 @@
 	uint8 pixel = *_madsVm->scene()->getWalkSurface()->getBasePtr(spriteFrame->x + (spriteFrame->width() / 2),
 		spriteFrame->y + (spriteFrame->height() / 2));
 
-	return _madsVm->scene()->_timerList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
+	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
 		-1, 100, (int)pixel - 1, 1, 1, 0, 0);
 }
 
@@ -91,7 +91,7 @@
 	uint8 pixel = *_madsVm->scene()->getWalkSurface()->getBasePtr(spriteFrame->x + (spriteFrame->width() / 2),
 		spriteFrame->y + (spriteFrame->height() / 2));
 
-	return _madsVm->scene()->_timerList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
+	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
 		-1, 100, (int)pixel - 1, 1, 2, 0, 0);
 }
 
@@ -100,7 +100,7 @@
 	uint8 pixel = *_madsVm->scene()->getWalkSurface()->getBasePtr(spriteFrame->x + (spriteFrame->width() / 2),
 		spriteFrame->y + (spriteFrame->height() / 2));
 
-	return _madsVm->scene()->_timerList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
+	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
 		-1, 100, (int)pixel - 1, -1, 1, 0, 0);
 }
 
@@ -187,7 +187,7 @@
 	_spriteIndexes[16] = startSpriteSequence(_spriteIndexes[1], 0, 4, 0, 1, 0);
 	_spriteIndexes[17] = startSpriteSequence(_spriteIndexes[2], 0, 4, 0, 1, 0);
 
-	_madsVm->scene()->_timerList.unk2(0, 2, 7, 0x46);
+	_madsVm->scene()->_sequenceList.unk2(0, 2, 7, 0x46);
 
 	_spriteIndexes[18] = startSpriteSequence2(_spriteIndexes[3], 0, 10, 0, 0, 60);
 	_spriteIndexes[19] = startSpriteSequence(_spriteIndexes[4], 0, 5, 0, 1, 0);

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-04-27 11:14:25 UTC (rev 48815)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-04-27 11:23:27 UTC (rev 48816)
@@ -312,6 +312,10 @@
 	_spriteSlots.getSprite(0).getFrame(1)->copyTo(this, 120, 90, 0);
 }
 
+void MadsScene::updateState() {
+	_sequenceList.tick();
+}
+
 int MadsScene::loadSceneSpriteSet(const char *setName) {
 	char resName[100];
 	strcpy(resName, setName);

Modified: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	2010-04-27 11:14:25 UTC (rev 48815)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-04-27 11:23:27 UTC (rev 48816)
@@ -159,6 +159,8 @@
 	virtual void setAction(int action, int objectId = -1);
 	virtual void update();
 
+	virtual void updateState();
+
 	int loadSceneSpriteSet(const char *setName);
 	void loadPlayerSprites(const char *prefix);
 	void showMADSV2TextBox(char *text, int x, int y, char *faceName);

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-04-27 11:14:25 UTC (rev 48815)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-04-27 11:23:27 UTC (rev 48816)
@@ -247,8 +247,8 @@
 
 /*--------------------------------------------------------------------------*/
 
-DynamicHotspots::DynamicHotspots(MadsView &owner): _owner(owner) {
-	for (int i = 0; HITBOX_AREA_SIZE; ++i) {
+MadsDynamicHotspots::MadsDynamicHotspots(MadsView &owner): _owner(owner) {
+	for (int i = 0; i < DYNAMIC_HOTSPOTS_SIZE; ++i) {
 		DynamicHotspot rec;
 		rec.active = false;
 	}
@@ -256,13 +256,13 @@
 	_count = 0;
 }
 
-int DynamicHotspots::add(int descId, int field14, int timerIndex, const Common::Rect &bounds) {
+int MadsDynamicHotspots::add(int descId, int field14, int timerIndex, const Common::Rect &bounds) {
 	// Find a free slot
 	uint idx = 0;
 	while ((idx < _entries.size()) && !_entries[idx].active)
 		++idx;
 	if (idx == _entries.size())
-		error("DynamicHotspots overflow");
+		error("MadsDynamicHotspots overflow");
 
 	_entries[idx].active = true;
 	_entries[idx].descId = descId;
@@ -276,12 +276,12 @@
 
 	++_count;
 	_flag = true;
-	_owner._timerList[timerIndex].dynamicHotspotIndex = idx;
+	_owner._sequenceList[timerIndex].dynamicHotspotIndex = idx;
 
 	return idx;
 }
 
-int DynamicHotspots::setPosition(int index, int xp, int yp, int facing) {
+int MadsDynamicHotspots::setPosition(int index, int xp, int yp, int facing) {
 	if (index >= 0) {
 		_entries[index].pos.x = xp;
 		_entries[index].pos.y = yp;
@@ -291,17 +291,17 @@
 	return index;
 }
 
-int DynamicHotspots::set17(int index, int v) {
+int MadsDynamicHotspots::set17(int index, int v) {
 	if (index >= 0)
 		_entries[index].field_17 = v;
 
 	return index;
 }
 
-void DynamicHotspots::remove(int index) {
+void MadsDynamicHotspots::remove(int index) {
 	if (_entries[index].active) {
 		if (_entries[index].timerIndex >= 0)
-			_owner._timerList[_entries[index].timerIndex].dynamicHotspotIndex = -1;
+			_owner._sequenceList[_entries[index].timerIndex].dynamicHotspotIndex = -1;
 		_entries[index].active = false;
 
 		--_count;
@@ -309,7 +309,7 @@
 	}
 }
 
-void DynamicHotspots::reset() {
+void MadsDynamicHotspots::reset() {
 	for (uint i = 0; i < _entries.size(); ++i)
 		_entries[i].active = false;
 
@@ -319,29 +319,29 @@
 
 /*--------------------------------------------------------------------------*/
 
-MadsTimerList::MadsTimerList(MadsView &owner): _owner(owner) {
+MadsSequenceList::MadsSequenceList(MadsView &owner): _owner(owner) {
 	for (int i = 0; i < TIMER_LIST_SIZE; ++i) {
-		MadsTimerEntry rec;
+		MadsSequenceEntry rec;
 		rec.active = 0;
 		rec.dynamicHotspotIndex = -1;
 		_entries.push_back(rec);
 	}
 }
 
-bool MadsTimerList::unk2(int index, int v1, int v2, int v3) {
+bool MadsSequenceList::unk2(int index, int v1, int v2, int v3) {
 	if (_entries[index].len27 >= TIMER_ENTRY_SUBSET_MAX)
 		return true;
 
 	int subIndex = _entries[index].len27++;
 	_entries[index].fld27[subIndex] = v1;
 	_entries[index].fld2C[subIndex] = v2;
-	_entries[index].field36 = v3;
+	_entries[index].fld36[subIndex] = v3;
 
 	return false;
 }
 
-int MadsTimerList::add(int spriteListIndex, int v0, int frameIndex, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
-		int height, int width, char field_12, char scale, char depth, int field_C, int field_A, int numSprites, 
+int MadsSequenceList::add(int spriteListIndex, int v0, int frameIndex, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
+		int height, int width, char field_12, char scale, char depth, int frameStart, int field_A, int numSprites, 
 		int spriteNum) {
 
 	// Find a free slot
@@ -356,7 +356,7 @@
 	if (numSprites == 0)
 		numSprites = _madsVm->scene()->_spriteSlots.getSprite(spriteListIndex).getCount();
 	if (spriteNum == numSprites)
-		field_C = 0;
+		frameStart = 0;
 
 	// Set the list entry fields
 	_entries[timerIndex].active = true;
@@ -366,7 +366,7 @@
 	_entries[timerIndex].spriteNum = spriteNum;
 	_entries[timerIndex].numSprites = numSprites;
 	_entries[timerIndex].field_A = field_A;
-	_entries[timerIndex].field_C = field_C;
+	_entries[timerIndex].frameStart = frameStart;
 	_entries[timerIndex].depth = depth;
 	_entries[timerIndex].scale = scale;
 	_entries[timerIndex].field_12 = field_12;
@@ -375,7 +375,7 @@
 	_entries[timerIndex].numTicks = numTicks;
 	_entries[timerIndex].extraTicks = extraTicks;
 
-	_entries[timerIndex].timeout = g_system->getMillis() + timeoutTicks * GAME_FRAME_DELAY;
+	_entries[timerIndex].timeout = _madsVm->_currentTimer + timeoutTicks;
 
 	_entries[timerIndex].field_24 = field_24;
 	_entries[timerIndex].field_25 = 0;
@@ -390,7 +390,7 @@
 	return timerIndex;
 }
 
-void MadsTimerList::remove(int timerIndex) {
+void MadsSequenceList::remove(int timerIndex) {
 	if (_entries[timerIndex].active) {
 		if (_entries[timerIndex].dynamicHotspotIndex >= 0)
 			_owner._dynamicHotspots.remove(_entries[timerIndex].dynamicHotspotIndex);
@@ -400,8 +400,8 @@
 	_owner._spriteSlots.deleteTimer(timerIndex);
 }
 
-void MadsTimerList::setSpriteSlot(int timerIndex, MadsSpriteSlot &spriteSlot) {
-	MadsTimerEntry &timerEntry = _entries[timerIndex];
+void MadsSequenceList::setSpriteSlot(int timerIndex, MadsSpriteSlot &spriteSlot) {
+	MadsSequenceEntry &timerEntry = _entries[timerIndex];
 	SpriteAsset &sprite = _owner._spriteSlots.getSprite(timerEntry.spriteListIndex);
 
 	// TODO: Figure out logic for spriteId value based on SPRITE_SLOT.field_0
@@ -421,8 +421,11 @@
 	}
 }
 
-bool MadsTimerList::loadSprites(int timerIndex) {
-	MadsTimerEntry &timerEntry = _entries[timerIndex];
+bool MadsSequenceList::loadSprites(int timerIndex) {
+	MadsSequenceEntry &timerEntry = _entries[timerIndex];
+	int slotIndex;
+	bool result = false;
+	int idx = -1;
 
 	_owner._spriteSlots.deleteTimer(timerIndex);
 	if (timerEntry.field_25 != 0) {
@@ -430,21 +433,102 @@
 		return false;
 	}
 
-	// TODO: Rest of method
+	if (timerEntry.spriteListIndex == -1) {
+		timerEntry.field_25 = -1;
+	} else if ((slotIndex = _owner._spriteSlots.getIndex()) >= 0) {
+		MadsSpriteSlot &spriteSlot = _owner._spriteSlots[slotIndex];
+		setSpriteSlot(timerIndex, spriteSlot);
 
-	return true;
+		int x2 = 0, y2 = 0;
+
+		if ((timerEntry.field_13 != 0) || (timerEntry.dynamicHotspotIndex >= 0)) {
+			SpriteAsset &spriteSet = _owner._spriteSlots.getSprite(timerEntry.spriteListIndex);
+			M4Sprite *frame = spriteSet.getFrame(timerEntry.frameIndex);
+			int width = frame->width() * timerEntry.scale / 200;
+			int height = frame->height() * timerEntry.scale / 100;
+
+			warning("frame size %d x %d", width, height);
+
+			// TODO: Missing stuff here, and I'm not certain about the dynamic hotspot stuff below
+
+			if (timerEntry.dynamicHotspotIndex >= 0) {
+				DynamicHotspot &dynHotspot = _owner._dynamicHotspots[timerEntry.dynamicHotspotIndex];
+
+				dynHotspot.bounds.left = MAX(x2 - width, 0);
+				dynHotspot.bounds.right = MAX(x2 - width, 319) - dynHotspot.bounds.left + 1;
+				dynHotspot.bounds.top = MAX(y2 - height, 0);
+				dynHotspot.bounds.bottom = MIN(y2, 155) - dynHotspot.bounds.top;
+
+				_owner._dynamicHotspots._flag = true;
+			}
+		}
+
+		// Frame adjustments
+		if (timerEntry.numSprites != timerEntry.spriteNum) 
+			timerEntry.frameIndex += timerEntry.frameStart;
+
+		if (timerEntry.frameIndex >= timerEntry.spriteNum) {
+			if (timerEntry.frameIndex > timerEntry.numSprites) {
+				result = true;
+				if (timerEntry.field_A != 2) {
+					timerEntry.frameIndex = timerEntry.spriteNum;
+				} else {
+					timerEntry.frameIndex = timerEntry.numSprites - 1;
+					timerEntry.frameStart = -1;
+				}
+			}
+		} else {
+			result = true;
+
+			if (timerEntry.field_A == 2) {
+				timerEntry.frameIndex = timerEntry.spriteNum + 1;
+				timerEntry.frameStart = 1;
+			} else {
+				timerEntry.frameIndex = timerEntry.numSprites;		
+			}
+		}
+
+		if (result && (timerEntry.field_24 != 0)) {
+			if (--timerEntry.field_24 != 0)
+				timerEntry.field_25 = -1;
+		}
+	} else {
+		// Out of sprite slots
+		timerEntry.field_25 = -1;
+	}
+
+	if (timerEntry.len27 > 0) {
+		for (int i = 0; i <= timerEntry.len27; ++i) {
+			if ((!timerEntry.fld27[i] && (timerEntry.field_25 != 0)) ||
+				((timerEntry.fld27[i] == 1) && result)) {
+				idx = i;
+			} else if (timerEntry.fld27[i] > 1) {
+				int v = timerEntry.fld2C[i];
+				if ((v == timerEntry.frameIndex) || (v == 0))
+					idx = i;
+			}
+		}
+	}
+
+	if (idx >= 0) {
+		_owner._abortTimers = timerEntry.fld36[idx];
+		
+		// TODO: Figure out word_84208, timerEntry.field_3B[]
+	}
+
+	return result;
 }
 
 /**
  * Handles counting down entries in the timer list for action
  */
-void MadsTimerList::tick() {
+void MadsSequenceList::tick() {
 	for (uint idx = 0; idx < _entries.size(); ++idx) {
 		if ((_owner._abortTimers2 == 0) && (_owner._abortTimers != 0))
 			break;
 
-		MadsTimerEntry &timerEntry = _entries[idx];
-		uint32 currentTimer = g_system->getMillis();
+		MadsSequenceEntry &timerEntry = _entries[idx];
+		uint32 currentTimer = _madsVm->_currentTimer;
 
 		if (!timerEntry.active || (currentTimer < timerEntry.timeout))
 			continue;
@@ -459,9 +543,17 @@
 	}
 }
 
+void MadsSequenceList::delay(uint32 v1, uint32 v2) {
+	for (uint idx = 0; idx < _entries.size(); ++idx) {
+		if (_entries[idx].active) {
+			_entries[idx].timeout += v1 - v2;
+		}
+	}
+}
+
 //--------------------------------------------------------------------------
 
-MadsView::MadsView(View *view): _view(view), _dynamicHotspots(*this), _timerList(*this) {
+MadsView::MadsView(View *view): _view(view), _dynamicHotspots(*this), _sequenceList(*this) {
 	_abortTimers = 0;
 	_abortTimers2 = 0;
 }

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-04-27 11:14:25 UTC (rev 48815)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-04-27 11:23:27 UTC (rev 48816)
@@ -169,16 +169,17 @@
 	DynamicHotspot() { active = false; }
 };
 
-#define HITBOX_AREA_SIZE 8
+#define DYNAMIC_HOTSPOTS_SIZE 8
 
-class DynamicHotspots {
+class MadsDynamicHotspots {
 private:
 	MadsView &_owner;
 	Common::Array<DynamicHotspot> _entries;
-	bool _flag;
 	int _count;
 public:
-	DynamicHotspots(MadsView &owner);
+	bool _flag;
+public:
+	MadsDynamicHotspots(MadsView &owner);
 
 	DynamicHotspot &operator[](uint idx) { return _entries[idx]; }
 	int add(int descId, int field14, int timerIndex, const Common::Rect &bounds);
@@ -190,7 +191,7 @@
 
 #define TIMER_ENTRY_SUBSET_MAX 5
 
-struct MadsTimerEntry {
+struct MadsSequenceEntry {
 	int8 active;
 	int8 spriteListIndex;
 	
@@ -201,7 +202,7 @@
 	int numSprites;
 	
 	int field_A;
-	int field_C;
+	int frameStart;
 
 	int depth;
 	int scale;
@@ -218,7 +219,7 @@
 	int len27;
 	int8 fld27[TIMER_ENTRY_SUBSET_MAX];
 	int16 fld2C[TIMER_ENTRY_SUBSET_MAX];
-	int8 field36;
+	int8 fld36[TIMER_ENTRY_SUBSET_MAX];
 	int field_3B;
 
 	uint16 actionNouns[3];
@@ -229,22 +230,23 @@
 
 #define TIMER_LIST_SIZE 30
 
-class MadsTimerList {
+class MadsSequenceList {
 private:
 	MadsView &_owner;
-	Common::Array<MadsTimerEntry> _entries;
+	Common::Array<MadsSequenceEntry> _entries;
 public:
-	MadsTimerList(MadsView &owner);
+	MadsSequenceList(MadsView &owner);
 
-	MadsTimerEntry &operator[](int index) { return _entries[index]; }	
+	MadsSequenceEntry &operator[](int index) { return _entries[index]; }	
 	bool unk2(int index, int v1, int v2, int v3);
 	int add(int spriteListIndex, int v0, int v1, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
-		int height, int width, char field_12, char scale, char depth, int field_C, int field_A, 
+		int height, int width, char field_12, char scale, char depth, int frameStart, int field_A, 
 		int numSprites, int spriteNum);
 	void remove(int timerIndex);
 	void setSpriteSlot(int timerIndex, MadsSpriteSlot &spriteSlot);
 	bool loadSprites(int timerIndex);
 	void tick();
+	void delay(uint32 v1, uint32 v2);
 };
 
 class MadsView {
@@ -254,8 +256,8 @@
 	MadsSpriteSlots _spriteSlots;
 	MadsTextDisplay _textDisplay;
 	ScreenObjects _screenObjects;
-	DynamicHotspots _dynamicHotspots;
-	MadsTimerList _timerList;
+	MadsDynamicHotspots _dynamicHotspots;
+	MadsSequenceList _sequenceList;
 
 	int _abortTimers;
 	int8 _abortTimers2;


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

Revision: 48875
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48875&view=rev
Author:   dreammaster
Date:     2010-04-30 11:27:42 +0000 (Fri, 30 Apr 2010)

Log Message:
-----------
Added proper names for some of the previous unknown timer fields, and bugfixes for the sequence list methods

Modified Paths:
--------------
    scummvm/trunk/engines/m4/assets.cpp
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/m4.h
    scummvm/trunk/engines/m4/mads_logic.cpp
    scummvm/trunk/engines/m4/mads_logic.h
    scummvm/trunk/engines/m4/mads_menus.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/assets.cpp
===================================================================
--- scummvm/trunk/engines/m4/assets.cpp	2010-04-29 22:11:22 UTC (rev 48874)
+++ scummvm/trunk/engines/m4/assets.cpp	2010-04-30 11:27:42 UTC (rev 48875)
@@ -227,7 +227,7 @@
 		frame.w = spriteStream->readUint16LE();
 		frame.h = spriteStream->readUint16LE();
 		if (curFrame == 0)
-			printf("%i frames, x = %i, y = %i, w = %i, h = %i\n", _frameCount, frame.x, frame.y, frame.w, frame.h);
+			debugC(1, kDebugGraphics, "%i frames, x = %i, y = %i, w = %i, h = %i\n", _frameCount, frame.x, frame.y, frame.w, frame.h);
 
 		frame.frame = new M4Sprite(spriteDataStream, frame.x, frame.y, frame.w, frame.h, false);
 		_frames.push_back(frame);

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2010-04-29 22:11:22 UTC (rev 48874)
+++ scummvm/trunk/engines/m4/m4.cpp	2010-04-30 11:27:42 UTC (rev 48875)
@@ -115,6 +115,7 @@
 	SearchMan.addSubDirectoryMatching(_gameDataDir, "resource");
 
 	DebugMan.addDebugChannel(kDebugScript, "script", "Script debug level");
+	DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics debug level");
 	DebugMan.addDebugChannel(kDebugConversations, "conversations", "Conversations debugging");
 
 	_resourceManager = NULL;

Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h	2010-04-29 22:11:22 UTC (rev 48874)
+++ scummvm/trunk/engines/m4/m4.h	2010-04-30 11:27:42 UTC (rev 48875)
@@ -113,7 +113,8 @@
 
 enum {
 	kDebugScript = 1 << 0,
-	kDebugConversations = 2 << 0
+	kDebugConversations = 1 << 1,
+	kDebugGraphics = 1 << 2
 };
 
 #define MESSAGE_BASIC 1

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-04-29 22:11:22 UTC (rev 48874)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-04-30 11:27:42 UTC (rev 48875)
@@ -83,16 +83,16 @@
 		spriteFrame->y + (spriteFrame->height() / 2));
 
 	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
-		-1, 100, (int)pixel - 1, 1, 1, 0, 0);
+		-1, 100, (int)pixel - 1, 1, ANIMTYPE_SINGLE_DIRECTION, 0, 0);
 }
 
-uint16 MadsSceneLogic::startSpriteSequence2(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks) {
+uint16 MadsSceneLogic::startCycledSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks) {
 	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(1);
 	uint8 pixel = *_madsVm->scene()->getWalkSurface()->getBasePtr(spriteFrame->x + (spriteFrame->width() / 2),
 		spriteFrame->y + (spriteFrame->height() / 2));
 
 	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
-		-1, 100, (int)pixel - 1, 1, 2, 0, 0);
+		-1, 100, (int)pixel - 1, 1, ANIMTYPE_CYCLED, 0, 0);
 }
 
 uint16 MadsSceneLogic::startSpriteSequence3(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks) {
@@ -101,7 +101,7 @@
 		spriteFrame->y + (spriteFrame->height() / 2));
 
 	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
-		-1, 100, (int)pixel - 1, -1, 1, 0, 0);
+		-1, 100, (int)pixel - 1, -1, ANIMTYPE_SINGLE_DIRECTION, 0, 0);
 }
 
 void MadsSceneLogic::activateHotspot(int idx, bool active) {
@@ -165,7 +165,7 @@
 void MadsSceneLogic::setupScene() {
 	// FIXME: This is the hardcoded logic for Rex scene 101 only
 	const char *animName = formAnimName('A', -1);
-warning("anim - %s\n", animName);	
+
 //	sub_1e754(animName, 3);
 
 	getSceneSpriteSet();
@@ -189,7 +189,7 @@
 
 	_madsVm->scene()->_sequenceList.unk2(0, 2, 7, 0x46);
 
-	_spriteIndexes[18] = startSpriteSequence2(_spriteIndexes[3], 0, 10, 0, 0, 60);
+	_spriteIndexes[18] = startCycledSpriteSequence(_spriteIndexes[3], 0, 10, 0, 0, 60);
 	_spriteIndexes[19] = startSpriteSequence(_spriteIndexes[4], 0, 5, 0, 1, 0);
 	_spriteIndexes[20] = startSpriteSequence(_spriteIndexes[5], 0, 10, 0, 2, 0);
 	_spriteIndexes[21] = startSpriteSequence(_spriteIndexes[6], 0, 6, 0, 0, 0);

Modified: scummvm/trunk/engines/m4/mads_logic.h
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.h	2010-04-29 22:11:22 UTC (rev 48874)
+++ scummvm/trunk/engines/m4/mads_logic.h	2010-04-30 11:27:42 UTC (rev 48875)
@@ -36,7 +36,7 @@
 	// Library interface methods
 	uint16 loadSpriteSet(uint16 suffixNum, uint16 sepChar);
 	uint16 startSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks);
-	uint16 startSpriteSequence2(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks);
+	uint16 startCycledSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks);
 	uint16 startSpriteSequence3(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks);
 	void activateHotspot(int idx, bool active);
 	void lowRoomsEntrySound();

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-04-29 22:11:22 UTC (rev 48874)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-04-30 11:27:42 UTC (rev 48875)
@@ -697,7 +697,7 @@
 	refreshText();
 
 	// Handle the drawing of the various Mads elements
-	refresh(rects);
+	refresh();
 
 	View::onRefresh(rects, destSurface);
 }

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-04-29 22:11:22 UTC (rev 48874)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-04-30 11:27:42 UTC (rev 48875)
@@ -263,26 +263,10 @@
  * Draws all the elements of the scene
  */
 void MadsScene::drawElements() {
-	// Display animations
-	_spriteSlots.draw(this);
+	refresh();
 
-	// Text display 
-	_textDisplay.draw(this);
-
 	// Copy the user interface surface onto the surface
 	_interfaceSurface->copyTo(this, 0, this->height() - _interfaceSurface->height());
-
-/*
-	// Some kind of copying over of slot entries
-	for (int idx = 0, idx2 = 0; idx < _spriteSlotsStart; ++idx) {
-		if (_spriteSlots[idx].spriteId >= 0) {
-			if (idx != idx2) {
-				// Copy over the slot entry
-				_spriteSlots[idx2] = _spriteSlots[idx];
-			}
-			++idx2;
-		}
-	}*/
 }
 
 

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-04-29 22:11:22 UTC (rev 48874)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-04-30 11:27:42 UTC (rev 48875)
@@ -36,14 +36,26 @@
 
 namespace M4 {
 
-static const int INV_ANIM_FRAME_SPEED = 8;
+static const int INV_ANIM_FRAME_SPEED = 2;
 static const int INVENTORY_X = 160;
 static const int INVENTORY_Y = 159;
 static const int SCROLLER_DELAY = 200;
 
 //--------------------------------------------------------------------------
 
+MadsSpriteSlots::MadsSpriteSlots() {
+	for (int i = 0; i < SPRITE_SLOTS_SIZE; ++i) {
+		MadsSpriteSlot rec;
+		_entries.push_back(rec);
+	}
+
+	startIndex = 0;
+}
+
 int MadsSpriteSlots::getIndex() {
+	if (startIndex == SPRITE_SLOTS_SIZE)
+		error("Run out of sprite slots");
+
 	return startIndex++;
 }
 
@@ -97,7 +109,7 @@
 	// Sort the list in order of the depth
 	Common::sort(depthList.begin(), depthList.end(), sortHelper);
 
-	// Loop through each of the objectes
+	// Loop through each of the objects
 	DepthList::iterator i;
 	for (i = depthList.begin(); i != depthList.end(); ++i) {
 		DepthEntry &de = *i;
@@ -131,6 +143,29 @@
 	}
 }
 
+/**
+ * Removes any sprite slots that are no longer needed
+ */
+void MadsSpriteSlots::cleanUp() {
+	// Delete any entries that aren't needed
+	int idx = 0;
+	while (idx < startIndex) {
+		if (_entries[idx].spriteId >= 0) {
+			_entries.remove_at(idx);
+			--startIndex;
+		} else {
+			++idx;
+		}
+	}
+
+	// Original engine sprite slot list was a fixed array, so to keep the engine similiar, for
+	// now I'm adding in new entries to make up the original fixed total again
+	while (_entries.size() < SPRITE_SLOTS_SIZE) {
+		MadsSpriteSlot rec;
+		_entries.push_back(rec);
+	}
+}
+
 //--------------------------------------------------------------------------
 
 MadsTextDisplay::MadsTextDisplay() {
@@ -191,6 +226,18 @@
 	}
 }
 
+/**
+ * Deactivates any text display entries that are finished
+ */
+void MadsTextDisplay::cleanUp() {
+	for (uint idx = 0; idx < _entries.size(); ++idx) {
+		if (_entries[idx].expire < 0) {
+			_entries[idx].active = false;
+			_entries[idx].expire = 0;
+		}
+	}
+}
+
 //--------------------------------------------------------------------------
 
 /**
@@ -341,8 +388,8 @@
 }
 
 int MadsSequenceList::add(int spriteListIndex, int v0, int frameIndex, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
-		int height, int width, char field_12, char scale, char depth, int frameStart, int field_A, int numSprites, 
-		int spriteNum) {
+		int height, int width, char field_12, char scale, char depth, int frameInc, SpriteAnimType animType, int numSprites, 
+		int frameStart) {
 
 	// Find a free slot
 	uint timerIndex = 0;
@@ -351,22 +398,22 @@
 	if (timerIndex == _entries.size())
 		error("TimerList full");
 
-	if (spriteNum <= 0)
-		spriteNum = 1;
+	if (frameStart <= 0)
+		frameStart = 1;
 	if (numSprites == 0)
 		numSprites = _madsVm->scene()->_spriteSlots.getSprite(spriteListIndex).getCount();
-	if (spriteNum == numSprites)
-		frameStart = 0;
+	if (frameStart == numSprites)
+		frameInc = 0;
 
 	// Set the list entry fields
 	_entries[timerIndex].active = true;
 	_entries[timerIndex].spriteListIndex = spriteListIndex;
 	_entries[timerIndex].field_2 = v0;
 	_entries[timerIndex].frameIndex = frameIndex;
-	_entries[timerIndex].spriteNum = spriteNum;
+	_entries[timerIndex].frameStart = frameStart;
 	_entries[timerIndex].numSprites = numSprites;
-	_entries[timerIndex].field_A = field_A;
-	_entries[timerIndex].frameStart = frameStart;
+	_entries[timerIndex].animType = animType;
+	_entries[timerIndex].frameInc = frameInc;
 	_entries[timerIndex].depth = depth;
 	_entries[timerIndex].scale = scale;
 	_entries[timerIndex].field_12 = field_12;
@@ -405,7 +452,7 @@
 	SpriteAsset &sprite = _owner._spriteSlots.getSprite(timerEntry.spriteListIndex);
 
 	// TODO: Figure out logic for spriteId value based on SPRITE_SLOT.field_0
-	spriteSlot.spriteId = (0 /*field 0*/ == 1) ? 0xFFFC : 1;
+	spriteSlot.spriteId = (0 /*field 0*/ == 1) ? -4 : 1;
 	spriteSlot.timerIndex = timerIndex;
 	spriteSlot.spriteListIndex = timerEntry.spriteListIndex;
 	spriteSlot.frameNumber = ((timerEntry.field_2 == 1) ? 0x8000 : 0) | timerEntry.frameIndex;
@@ -416,8 +463,8 @@
 		spriteSlot.xp = timerEntry.width;
 		spriteSlot.yp = timerEntry.height;
 	} else {
-		spriteSlot.xp = sprite.getFrame(timerEntry.frameIndex)->x;
-		spriteSlot.yp = sprite.getFrame(timerEntry.frameIndex)->y;
+		spriteSlot.xp = sprite.getFrame(timerEntry.frameIndex - 1)->x;
+		spriteSlot.yp = sprite.getFrame(timerEntry.frameIndex - 1)->y;
 	}
 }
 
@@ -443,7 +490,7 @@
 
 		if ((timerEntry.field_13 != 0) || (timerEntry.dynamicHotspotIndex >= 0)) {
 			SpriteAsset &spriteSet = _owner._spriteSlots.getSprite(timerEntry.spriteListIndex);
-			M4Sprite *frame = spriteSet.getFrame(timerEntry.frameIndex);
+			M4Sprite *frame = spriteSet.getFrame(timerEntry.frameIndex - 1);
 			int width = frame->width() * timerEntry.scale / 200;
 			int height = frame->height() * timerEntry.scale / 100;
 
@@ -464,26 +511,32 @@
 		}
 
 		// Frame adjustments
-		if (timerEntry.numSprites != timerEntry.spriteNum) 
-			timerEntry.frameIndex += timerEntry.frameStart;
+		if (timerEntry.frameStart != timerEntry.numSprites)
+			timerEntry.frameIndex += timerEntry.frameInc;
 
-		if (timerEntry.frameIndex >= timerEntry.spriteNum) {
+		if (timerEntry.frameIndex >= timerEntry.frameStart) {
 			if (timerEntry.frameIndex > timerEntry.numSprites) {
 				result = true;
-				if (timerEntry.field_A != 2) {
-					timerEntry.frameIndex = timerEntry.spriteNum;
+				if (timerEntry.animType != ANIMTYPE_CYCLED) {
+					// Keep index from exceeding maximum allowed
+					timerEntry.frameIndex = timerEntry.frameStart;
 				} else {
+					// Switch into reverse
 					timerEntry.frameIndex = timerEntry.numSprites - 1;
-					timerEntry.frameStart = -1;
+					timerEntry.frameInc = -1;
 				}
 			}
 		} else {
+			// Currently in reverse mode
 			result = true;
 
-			if (timerEntry.field_A == 2) {
-				timerEntry.frameIndex = timerEntry.spriteNum + 1;
-				timerEntry.frameStart = 1;
+			if (timerEntry.animType == ANIMTYPE_CYCLED)
+			{
+				// Switch back to forward direction again
+				timerEntry.frameIndex = timerEntry.frameStart + 1;
+				timerEntry.frameInc = 1;
 			} else {
+				// Otherwise reset back to last sprite for further reverse animating
 				timerEntry.frameIndex = timerEntry.numSprites;		
 			}
 		}
@@ -511,7 +564,7 @@
 	}
 
 	if (idx >= 0) {
-		_owner._abortTimers = timerEntry.fld36[idx];
+		//_owner._abortTimers = timerEntry.fld36[idx];
 		
 		// TODO: Figure out word_84208, timerEntry.field_3B[]
 	}
@@ -558,12 +611,18 @@
 	_abortTimers2 = 0;
 }
 
-void MadsView::refresh(RectList *rects) {
+void MadsView::refresh() {
 	// Draw any sprites
 	_spriteSlots.draw(_view);
 
 	// Draw text elements onto the view
 	_textDisplay.draw(_view);
+
+	// Remove any sprite slots that are no longer needed
+	_spriteSlots.cleanUp();
+
+	// Deactivate any text display entries that are no longer needed
+	_textDisplay.cleanUp();
 }
 
 /*--------------------------------------------------------------------------

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-04-29 22:11:22 UTC (rev 48874)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-04-30 11:27:42 UTC (rev 48875)
@@ -60,12 +60,12 @@
 
 class MadsSpriteSlots {
 private:
-	MadsSpriteSlot _entries[SPRITE_SLOTS_SIZE];
+	Common::Array<MadsSpriteSlot> _entries;
 	SpriteList _sprites;
 public:
 	int startIndex;
 
-	MadsSpriteSlots() { startIndex = 0; }
+	MadsSpriteSlots();
 
 	MadsSpriteSlot &operator[](int idx) {
 		assert(idx < SPRITE_SLOTS_SIZE);
@@ -85,6 +85,7 @@
 	void deleteTimer(int timerIndex);
 
 	void draw(View *view);
+	void cleanUp();
 };
 
 class MadsTextDisplayEntry {
@@ -122,6 +123,7 @@
 	int add(int xp, int yp, uint fontColour, int charSpacing, const char *msg, Font *font);
 	void clear();
 	void draw(View *view);
+	void cleanUp();
 };
 
 class ScreenObjectEntry {
@@ -191,6 +193,8 @@
 
 #define TIMER_ENTRY_SUBSET_MAX 5
 
+enum SpriteAnimType {ANIMTYPE_SINGLE_DIRECTION = 1, ANIMTYPE_CYCLED = 2};
+
 struct MadsSequenceEntry {
 	int8 active;
 	int8 spriteListIndex;
@@ -198,12 +202,12 @@
 	int field_2;
 	
 	int frameIndex;
-	int spriteNum;
+	int frameStart;
 	int numSprites;
-	
-	int field_A;
-	int frameStart;
 
+	SpriteAnimType animType;
+	int frameInc;
+
 	int depth;
 	int scale;
 	int dynamicHotspotIndex;
@@ -240,8 +244,8 @@
 	MadsSequenceEntry &operator[](int index) { return _entries[index]; }	
 	bool unk2(int index, int v1, int v2, int v3);
 	int add(int spriteListIndex, int v0, int v1, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
-		int height, int width, char field_12, char scale, char depth, int frameStart, int field_A, 
-		int numSprites, int spriteNum);
+		int height, int width, char field_12, char scale, char depth, int frameInc, SpriteAnimType animType, 
+		int numSprites, int frameStart);
 	void remove(int timerIndex);
 	void setSpriteSlot(int timerIndex, MadsSpriteSlot &spriteSlot);
 	bool loadSprites(int timerIndex);
@@ -264,7 +268,7 @@
 public:
 	MadsView(View *view);
 
-	void refresh(RectList *rects);
+	void refresh();
 };
 
 #define CHEAT_SEQUENCE_MAX 8


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

Revision: 49034
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49034&view=rev
Author:   dreammaster
Date:     2010-05-15 00:28:44 +0000 (Sat, 15 May 2010)

Log Message:
-----------
Decoded further fields in the SequenceList class, and started implementation of kernel message display

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

Modified: scummvm/trunk/engines/m4/font.h
===================================================================
--- scummvm/trunk/engines/m4/font.h	2010-05-14 20:13:30 UTC (rev 49033)
+++ scummvm/trunk/engines/m4/font.h	2010-05-15 00:28:44 UTC (rev 49034)
@@ -61,6 +61,12 @@
 public:
 	Font(MadsM4Engine *vm);
 	~Font();
+
+	Font *getFont(const char *filename) {
+		// TODO: Proper separation of font instances
+		setFont(filename);
+		return this;
+	}
 	void setFont(const char *filename);
 	void setColor(uint8 color);
 	void setColors(uint8 alt1, uint8 alt2, uint8 foreground);

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-14 20:13:30 UTC (rev 49033)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-15 00:28:44 UTC (rev 49034)
@@ -164,7 +164,8 @@
 
 void MadsSceneLogic::setupScene() {
 	// FIXME: This is the hardcoded logic for Rex scene 101 only
-	//const char *animName = formAnimName('A', -1);
+	const char *animName = formAnimName('A', -1);
+	warning("anim - %s", animName);
 
 //	sub_1e754(animName, 3);
 
@@ -187,7 +188,7 @@
 	_spriteIndexes[16] = startSpriteSequence(_spriteIndexes[1], 0, 4, 0, 1, 0);
 	_spriteIndexes[17] = startSpriteSequence(_spriteIndexes[2], 0, 4, 0, 1, 0);
 
-	_madsVm->scene()->_sequenceList.unk2(0, 2, 7, 0x46);
+	_madsVm->scene()->_sequenceList.addSubEntry(0, SM_FRAME_INDEX, 7, 70);
 
 	_spriteIndexes[18] = startCycledSpriteSequence(_spriteIndexes[3], 0, 10, 0, 0, 60);
 	_spriteIndexes[19] = startSpriteSequence(_spriteIndexes[4], 0, 5, 0, 1, 0);

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-05-14 20:13:30 UTC (rev 49033)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-05-15 00:28:44 UTC (rev 49034)
@@ -57,6 +57,12 @@
  * Secondary scene loading code
  */
 void MadsScene::loadScene2(const char *aaName) {
+	// TODO: Completely finish
+
+	_spriteSlots.clear();
+	_sequenceList.clear();
+	_kernelMessages.clear();
+
 	// Load up the properties for the scene
 	_sceneResources.load(_currentScene);
 
@@ -652,42 +658,6 @@
  * Adds a new entry to the timed on-screen text display list
  */
 /*
-int MadsScreenText::addTimed(const Common::Point &destPos, uint fontColours, uint flags, int vUnknown, uint32 timeout, const char *message) {
-	// Find a free slot
-	int idx = 0;
-	while ((idx < TIMED_TEXT_SIZE) && ((_timedText[idx].flags & TEXTFLAG_ACTIVE) != 0))
-		++idx;
-	if (idx == TIMED_TEXT_SIZE) {
-		if (vUnknown == 0)
-			return -1;
-
-		error("Ran out of timed text display slots");
-	}
-
-	// Set up the entry values
-	_timedText[idx].flags = flags | TEXTFLAG_ACTIVE;
-	strcpy(_timedText[idx].message, message);
-	_timedText[idx].colour1 = fontColours & 0xff;
-	_timedText[idx].colour2 = fontColours >> 8;
-	_timedText[idx].position.x = destPos.x;
-	_timedText[idx].position.y = destPos.y;
-	_timedText[idx].textDisplayIndex = -1;
-	_timedText[idx].timeout = timeout;
-	_timedText[idx].frameTimer = g_system->getMillis();
-	_timedText[idx].field_1C = vUnknown;
-	_timedText[idx].field_1D = 0; // word_84206
-
-	// Copy the current action noun list
-	for (int i = 0; i < 3; ++i)
-		_timedText[idx].actionNouns[i] = _madsVm->scene()->actionNouns[i];
-
-	if (flags & TEXTFLAG_2) {
-		warning("word_844b8 and dword_845a0 not yet implemented");
-	}
-
-	return idx;
-}
-
 void MadsScreenText::draw(M4Surface *surface) {
 }
 

Modified: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	2010-05-14 20:13:30 UTC (rev 49033)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-05-15 00:28:44 UTC (rev 49034)
@@ -66,27 +66,6 @@
 	void load(int sceneId);	
 };
 
-#define TIMED_TEXT_SIZE 10
-#define TEXT_4A_SIZE 30
-
-enum TalkTextFlags {TEXTFLAG_2 = 2, TEXTFLAG_4 = 4, TEXTFLAG_8 = 8, TEXTFLAG_40 = 0x40,
-		TEXTFLAG_ACTIVE = 0x80};
-
-struct TimedText {
-	uint8 flags;
-	int colour1;
-	int colour2;
-	Common::Point position;
-	int textDisplayIndex;
-	int timerIndex;
-	uint32 timeout;
-	uint32 frameTimer;
-	bool field_1C;
-	uint8 field_1D;
-	uint16 actionNouns[3];
-	char message[100];
-};
-
 enum MadsActionMode {ACTMODE_NONE = 0, ACTMODE_VERB = 1, ACTMODE_OBJECT = 3, ACTMODE_TALK = 6};
 enum MAdsActionMode2 {ACTMODE2_0 = 0, ACTMODE2_2 = 2, ACTMODE2_5 = 5};
 

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-05-14 20:13:30 UTC (rev 49033)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-05-15 00:28:44 UTC (rev 49034)
@@ -240,6 +240,108 @@
 
 //--------------------------------------------------------------------------
 
+MadsKernelMessageList::MadsKernelMessageList(MadsView &owner): _owner(owner) {
+	for (int i = 0; i < TIMED_TEXT_SIZE; ++i) {
+		MadsKernelMessageListEntry rec;
+		_entries.push_back(rec);
+	}
+
+	_owner._textSpacing = -1;
+	_talkFont = _vm->_font->getFont(FONT_CONVERSATION_MADS);
+}
+
+void MadsKernelMessageList::clear() {
+	for (uint i = 0; i < _entries.size(); ++i)
+		_entries[i].flags = 0;
+
+	_owner._textSpacing = -1;
+	_talkFont = _vm->_font->getFont(FONT_CONVERSATION_MADS);
+}
+
+int MadsKernelMessageList::add(const Common::Point &pt, uint fontColour, uint8 flags, uint8 v2, uint32 timeout, char *msg) {
+	// Find a free slot
+	uint idx = 0;
+	while ((idx < _entries.size()) && ((_entries[idx].flags & KMSG_ACTIVE) != 0))
+		++idx;
+	if (idx == _entries.size()) {
+		if (v2 == 0)
+			return -1;
+
+		error("MadsKernelList overflow");
+	}
+
+	MadsKernelMessageListEntry &rec = _entries[idx];
+	rec.msg = msg;
+	rec.flags = flags | KMSG_ACTIVE;
+	rec.colour1 = fontColour & 0xff;
+	rec.colour2 = fontColour >> 8;
+	rec.position = pt;
+	rec.textDisplayIndex = -1;
+	rec.timeout = timeout;
+	rec.frameTimer = _madsVm->_currentTimer;
+	rec.field_1C = v2;
+	rec.abortMode = _owner._abortTimersMode2;
+	
+	for (int i = 0; i < 3; ++i)
+		rec.actionNouns[i] = _madsVm->scene()->actionNouns[i];
+
+	if (flags & KMSG_2)
+		rec.frameTimer = _owner._ticksAmount + _owner._newTimeout;
+
+	return idx;
+}
+
+void MadsKernelMessageList::unk1(int msgIndex, int v1, int v2) {
+	if (msgIndex < 0)
+		return;
+
+	_entries[msgIndex].flags |= (v2 == 0) ? KMSG_8 : (KMSG_8 | KMSG_1);
+	_entries[msgIndex].msgOffset = 0;
+	_entries[msgIndex].field_E = v1;
+	_entries[msgIndex].frameTimer2 = _madsVm->_currentTimer;
+
+	const char *msgP = _entries[msgIndex].msg;
+	_entries[msgIndex].asciiChar = *msgP;
+	_entries[msgIndex].asciiChar2 = *(msgP + 1);
+
+	if (_entries[msgIndex].flags & KMSG_2)
+		_entries[msgIndex].frameTimer2 = _owner._ticksAmount + _owner._newTimeout;
+
+	_entries[msgIndex].frameTimer = _entries[msgIndex].frameTimer2;
+}
+
+void MadsKernelMessageList::setSeqIndex(int msgIndex, int seqIndex) {
+	if (msgIndex >= 0) {
+		_entries[msgIndex].flags |= KMSG_4;
+		_entries[msgIndex].sequenceIndex = seqIndex;
+	}
+}
+
+void MadsKernelMessageList::remove(int msgIndex) {
+	MadsKernelMessageListEntry &rec = _entries[msgIndex];
+
+	if (rec.flags & KMSG_ACTIVE) {
+		if (rec.flags & KMSG_8) {
+			*(rec.msg + rec.msgOffset) = rec.asciiChar;
+			*(rec.msg + rec.msgOffset + 1) = rec.asciiChar2;
+		}
+
+		if (rec.textDisplayIndex >= 0)
+			_owner._textDisplay.expire(rec.textDisplayIndex);
+
+		rec.flags &= ~KMSG_ACTIVE;
+	}
+}
+
+void MadsKernelMessageList::reset() {
+	for (uint i = 0; i < _entries.size(); ++i)
+		remove(i);
+
+	// sub_20454
+}
+
+//--------------------------------------------------------------------------
+
 /**
  * Clears the entries list
  */
@@ -375,14 +477,21 @@
 	}
 }
 
-bool MadsSequenceList::unk2(int index, int v1, int v2, int v3) {
-	if (_entries[index].len27 >= TIMER_ENTRY_SUBSET_MAX)
+void MadsSequenceList::clear() {
+	for (uint i = 0; i < _entries.size(); ++i) {
+		_entries[i].active = 0;
+		_entries[i].dynamicHotspotIndex = -1;
+	}
+}
+
+bool MadsSequenceList::addSubEntry(int index, SequenceSubEntryMode mode, int frameIndex, int abortVal) {
+	if (_entries[index].entries.count >= TIMER_ENTRY_SUBSET_MAX)
 		return true;
 
-	int subIndex = _entries[index].len27++;
-	_entries[index].fld27[subIndex] = v1;
-	_entries[index].fld2C[subIndex] = v2;
-	_entries[index].fld36[subIndex] = v3;
+	int subIndex = _entries[index].entries.count++;
+	_entries[index].entries.mode[subIndex] = mode;
+	_entries[index].entries.frameIndex[subIndex] = frameIndex;
+	_entries[index].entries.abortVal[subIndex] = abortVal;
 
 	return false;
 }
@@ -428,8 +537,8 @@
 	_entries[timerIndex].field_25 = 0;
 	_entries[timerIndex].field_13 = 0;
 	_entries[timerIndex].dynamicHotspotIndex = -1;
-	_entries[timerIndex].len27 = 0;
-	_entries[timerIndex].field_3B = 0; //word_84206
+	_entries[timerIndex].entries.count = 0;
+	_entries[timerIndex].abortMode = _owner._abortTimersMode2;
 
 	for (int i = 0; i < 3; ++i)
 		_entries[timerIndex].actionNouns[i] = _madsVm->scene()->actionNouns[i];
@@ -469,37 +578,37 @@
 }
 
 bool MadsSequenceList::loadSprites(int timerIndex) {
-	MadsSequenceEntry &timerEntry = _entries[timerIndex];
+	MadsSequenceEntry &seqEntry = _entries[timerIndex];
 	int slotIndex;
 	bool result = false;
 	int idx = -1;
 
 	_owner._spriteSlots.deleteTimer(timerIndex);
-	if (timerEntry.field_25 != 0) {
+	if (seqEntry.field_25 != 0) {
 		remove(timerIndex);
 		return false;
 	}
 
-	if (timerEntry.spriteListIndex == -1) {
-		timerEntry.field_25 = -1;
+	if (seqEntry.spriteListIndex == -1) {
+		seqEntry.field_25 = -1;
 	} else if ((slotIndex = _owner._spriteSlots.getIndex()) >= 0) {
 		MadsSpriteSlot &spriteSlot = _owner._spriteSlots[slotIndex];
 		setSpriteSlot(timerIndex, spriteSlot);
 
 		int x2 = 0, y2 = 0;
 
-		if ((timerEntry.field_13 != 0) || (timerEntry.dynamicHotspotIndex >= 0)) {
-			SpriteAsset &spriteSet = _owner._spriteSlots.getSprite(timerEntry.spriteListIndex);
-			M4Sprite *frame = spriteSet.getFrame(timerEntry.frameIndex - 1);
-			int width = frame->width() * timerEntry.scale / 200;
-			int height = frame->height() * timerEntry.scale / 100;
+		if ((seqEntry.field_13 != 0) || (seqEntry.dynamicHotspotIndex >= 0)) {
+			SpriteAsset &spriteSet = _owner._spriteSlots.getSprite(seqEntry.spriteListIndex);
+			M4Sprite *frame = spriteSet.getFrame(seqEntry.frameIndex - 1);
+			int width = frame->width() * seqEntry.scale / 200;
+			int height = frame->height() * seqEntry.scale / 100;
 
 			warning("frame size %d x %d", width, height);
 
 			// TODO: Missing stuff here, and I'm not certain about the dynamic hotspot stuff below
 
-			if (timerEntry.dynamicHotspotIndex >= 0) {
-				DynamicHotspot &dynHotspot = _owner._dynamicHotspots[timerEntry.dynamicHotspotIndex];
+			if (seqEntry.dynamicHotspotIndex >= 0) {
+				DynamicHotspot &dynHotspot = _owner._dynamicHotspots[seqEntry.dynamicHotspotIndex];
 
 				dynHotspot.bounds.left = MAX(x2 - width, 0);
 				dynHotspot.bounds.right = MAX(x2 - width, 319) - dynHotspot.bounds.left + 1;
@@ -511,62 +620,70 @@
 		}
 
 		// Frame adjustments
-		if (timerEntry.frameStart != timerEntry.numSprites)
-			timerEntry.frameIndex += timerEntry.frameInc;
+		if (seqEntry.frameStart != seqEntry.numSprites)
+			seqEntry.frameIndex += seqEntry.frameInc;
 
-		if (timerEntry.frameIndex >= timerEntry.frameStart) {
-			if (timerEntry.frameIndex > timerEntry.numSprites) {
+		if (seqEntry.frameIndex >= seqEntry.frameStart) {
+			if (seqEntry.frameIndex > seqEntry.numSprites) {
 				result = true;
-				if (timerEntry.animType != ANIMTYPE_CYCLED) {
+				if (seqEntry.animType != ANIMTYPE_CYCLED) {
 					// Keep index from exceeding maximum allowed
-					timerEntry.frameIndex = timerEntry.frameStart;
+					seqEntry.frameIndex = seqEntry.frameStart;
 				} else {
 					// Switch into reverse
-					timerEntry.frameIndex = timerEntry.numSprites - 1;
-					timerEntry.frameInc = -1;
+					seqEntry.frameIndex = seqEntry.numSprites - 1;
+					seqEntry.frameInc = -1;
 				}
 			}
 		} else {
 			// Currently in reverse mode
 			result = true;
 
-			if (timerEntry.animType == ANIMTYPE_CYCLED)
+			if (seqEntry.animType == ANIMTYPE_CYCLED)
 			{
 				// Switch back to forward direction again
-				timerEntry.frameIndex = timerEntry.frameStart + 1;
-				timerEntry.frameInc = 1;
+				seqEntry.frameIndex = seqEntry.frameStart + 1;
+				seqEntry.frameInc = 1;
 			} else {
 				// Otherwise reset back to last sprite for further reverse animating
-				timerEntry.frameIndex = timerEntry.numSprites;		
+				seqEntry.frameIndex = seqEntry.numSprites;		
 			}
 		}
 
-		if (result && (timerEntry.field_24 != 0)) {
-			if (--timerEntry.field_24 != 0)
-				timerEntry.field_25 = -1;
+		if (result && (seqEntry.field_24 != 0)) {
+			if (--seqEntry.field_24 != 0)
+				seqEntry.field_25 = -1;
 		}
 	} else {
 		// Out of sprite slots
-		timerEntry.field_25 = -1;
+		seqEntry.field_25 = -1;
 	}
 
-	if (timerEntry.len27 > 0) {
-		for (int i = 0; i <= timerEntry.len27; ++i) {
-			if ((!timerEntry.fld27[i] && (timerEntry.field_25 != 0)) ||
-				((timerEntry.fld27[i] == 1) && result)) {
+	if (seqEntry.entries.count > 0) {
+		for (int i = 0; i <= seqEntry.entries.count; ++i) {
+			switch (seqEntry.entries.mode[i]) {
+			case SM_0:
+			case SM_1:
+				if (((seqEntry.entries.mode[i] == SM_0) && (seqEntry.field_25 != 0)) ||
+					((seqEntry.entries.mode[i] == SM_1) && result))
 				idx = i;
-			} else if (timerEntry.fld27[i] > 1) {
-				int v = timerEntry.fld2C[i];
-				if ((v == timerEntry.frameIndex) || (v == 0))
+				break;
+
+			case SM_FRAME_INDEX: {
+				int v = seqEntry.entries.frameIndex[i];
+				if ((v == seqEntry.frameIndex) || (v == 0))
 					idx = i;
 			}
+
+			default:
+				break;
+			}
 		}
 	}
 
 	if (idx >= 0) {
-		//_owner._abortTimers = timerEntry.fld36[idx];
-		
-		// TODO: Figure out word_84208, timerEntry.field_3B[]
+		_owner._abortTimers = seqEntry.entries.abortVal[idx];
+		_owner._abortTimersMode = seqEntry.abortMode;
 	}
 
 	return result;
@@ -606,9 +723,15 @@
 
 //--------------------------------------------------------------------------
 
-MadsView::MadsView(View *view): _view(view), _dynamicHotspots(*this), _sequenceList(*this) {
+MadsView::MadsView(View *view): _view(view), _dynamicHotspots(*this), _sequenceList(*this),
+		_kernelMessages(*this) {
+	_textSpacing = -1;
+	_ticksAmount = 3;
+	_newTimeout = 0;
 	_abortTimers = 0;
 	_abortTimers2 = 0;
+	_abortTimersMode = ABORTMODE_0;
+	_abortTimersMode2 = ABORTMODE_0;
 }
 
 void MadsView::refresh() {

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-05-14 20:13:30 UTC (rev 49033)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-05-15 00:28:44 UTC (rev 49034)
@@ -40,6 +40,8 @@
 
 class MadsView;
 
+enum AbortTimerMode {ABORTMODE_0 = 0, ABORTMODE_1 = 1, ABORTMODE_2 = 2};
+
 class MadsSpriteSlot {
 public:
 	int spriteId;
@@ -126,6 +128,48 @@
 	void cleanUp();
 };
 
+#define TIMED_TEXT_SIZE 10
+#define TEXT_4A_SIZE 30
+
+enum KernelMessageFlags {KMSG_1 = 1, KMSG_2 = 2, KMSG_4 = 4, KMSG_8 = 8, KMSG_40 = 0x40, KMSG_ACTIVE = 0x80};
+
+class MadsKernelMessageListEntry {
+public:
+	uint8 flags;
+	int sequenceIndex;
+	char asciiChar;
+	char asciiChar2;
+	int colour1;
+	int colour2;
+	Common::Point position;
+	int textDisplayIndex;
+	int msgOffset;
+	int field_E;
+	uint32 frameTimer2;
+	uint32 frameTimer;
+	uint32 timeout;
+	bool field_1C;
+	AbortTimerMode abortMode;
+	uint16 actionNouns[3];
+	char *msg;
+};
+
+class MadsKernelMessageList {
+private:
+	MadsView &_owner;
+	Common::Array<MadsKernelMessageListEntry> _entries;
+	Font *_talkFont;
+public:
+	MadsKernelMessageList(MadsView &owner);
+
+	void clear();
+	int add(const Common::Point &pt, uint fontColour, uint8 flags, uint8 v2, uint32 timeout, char *msg);
+	void unk1(int msgIndex, int v1, int v2);
+	void setSeqIndex(int msgIndex, int seqIndex);
+	void remove(int msgIndex);
+	void reset();
+};
+
 class ScreenObjectEntry {
 public:
 	Common::Rect bounds;
@@ -191,9 +235,18 @@
 	void reset();
 };
 
+enum SpriteAnimType {ANIMTYPE_SINGLE_DIRECTION = 1, ANIMTYPE_CYCLED = 2};
+
+enum SequenceSubEntryMode {SM_0 = 0, SM_1 = 1, SM_FRAME_INDEX = 2};
+
 #define TIMER_ENTRY_SUBSET_MAX 5
 
-enum SpriteAnimType {ANIMTYPE_SINGLE_DIRECTION = 1, ANIMTYPE_CYCLED = 2};
+struct MadsSequenceSubEntries {
+	int count;
+	SequenceSubEntryMode mode[TIMER_ENTRY_SUBSET_MAX];
+	int16 frameIndex[TIMER_ENTRY_SUBSET_MAX];
+	int8 abortVal[TIMER_ENTRY_SUBSET_MAX];
+};
 
 struct MadsSequenceEntry {
 	int8 active;
@@ -220,11 +273,8 @@
 	
 	int field_24;
 	int field_25;
-	int len27;
-	int8 fld27[TIMER_ENTRY_SUBSET_MAX];
-	int16 fld2C[TIMER_ENTRY_SUBSET_MAX];
-	int8 fld36[TIMER_ENTRY_SUBSET_MAX];
-	int field_3B;
+	MadsSequenceSubEntries entries;
+	AbortTimerMode abortMode;
 
 	uint16 actionNouns[3];
 	int numTicks;
@@ -242,7 +292,8 @@
 	MadsSequenceList(MadsView &owner);
 
 	MadsSequenceEntry &operator[](int index) { return _entries[index]; }	
-	bool unk2(int index, int v1, int v2, int v3);
+	void clear();
+	bool addSubEntry(int index, SequenceSubEntryMode mode, int frameIndex, int abortVal);
 	int add(int spriteListIndex, int v0, int v1, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
 		int height, int width, char field_12, char scale, char depth, int frameInc, SpriteAnimType animType, 
 		int numSprites, int frameStart);
@@ -259,12 +310,18 @@
 public:
 	MadsSpriteSlots _spriteSlots;
 	MadsTextDisplay _textDisplay;
+	MadsKernelMessageList _kernelMessages;
 	ScreenObjects _screenObjects;
 	MadsDynamicHotspots _dynamicHotspots;
 	MadsSequenceList _sequenceList;
 
+	int _textSpacing;
+	int _ticksAmount;
+	uint32 _newTimeout;
 	int _abortTimers;
 	int8 _abortTimers2;
+	AbortTimerMode _abortTimersMode;
+	AbortTimerMode _abortTimersMode2;
 public:
 	MadsView(View *view);
 


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

Revision: 49035
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49035&view=rev
Author:   dreammaster
Date:     2010-05-15 00:42:56 +0000 (Sat, 15 May 2010)

Log Message:
-----------
Removed use of globally constructed menu item position lists

Modified Paths:
--------------
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/mads_menus.h

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-05-15 00:28:44 UTC (rev 49034)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-05-15 00:42:56 UTC (rev 49035)
@@ -32,16 +32,6 @@
 #define PHANTOM_MENUSCREEN 920
 #define DRAGON_MENUSCREEN 922
 
-static Common::Point rexMenuItemPosList[6] = {
-	Common::Point(12, 68), Common::Point(12, 87), Common::Point(12, 107),
-	Common::Point(184, 75), Common::Point(245, 75), Common::Point(184, 99)
-};
-
-static Common::Point dragonMenuItemPosList[6] = {
-	Common::Point(46, 187), Common::Point(92, 187), Common::Point(138, 187),
-	Common::Point(184, 187), Common::Point(230, 187), Common::Point(276, 187)
-};
-
 #define DRAGON_MENU_BUTTON_W = 45
 #define DRAGON_MENU_BUTTON_H = 11
 
@@ -71,6 +61,14 @@
 	setColor(2);
 	hLine(0, width() - 1, row - 1);
 	hLine(0, width() - 1, height() - row + 1);
+
+	// Set up the menu item pos list
+	_menuItemPosList[0] = Common::Point(12, 68);
+	_menuItemPosList[1] = Common::Point(12, 87);
+	_menuItemPosList[2] = Common::Point(12, 107);
+	_menuItemPosList[3] = Common::Point(184, 75);
+	_menuItemPosList[4] = Common::Point(245, 75);
+	_menuItemPosList[5] = Common::Point(184, 99);
 }
 
 RexMainMenuView::~RexMainMenuView() {
@@ -164,7 +162,7 @@
 				_highlightedIndex = menuIndex;
 				if (_highlightedIndex != -1) {
 					M4Sprite *spr = _menuItem->getFrame(_highlightedIndex);
-					const Common::Point &pt = rexMenuItemPosList[_highlightedIndex];
+					const Common::Point &pt = _menuItemPosList[_highlightedIndex];
 					spr->copyTo(this, pt.x, row + pt.y, 0);
 				}
 			}
@@ -212,8 +210,8 @@
 				// Draw the final frame of the menuitem
 				M4Sprite *spr = _menuItem->getFrame(0);
 				itemSize = _menuItem->getFrame(0)->height();
-				spr->copyTo(this, rexMenuItemPosList[_menuItemIndex - 1].x,
-					rexMenuItemPosList[_menuItemIndex - 1].y + row + (itemSize / 2) - (spr->height() / 2), 0);
+				spr->copyTo(this, _menuItemPosList[_menuItemIndex - 1].x,
+					_menuItemPosList[_menuItemIndex - 1].y + row + (itemSize / 2) - (spr->height() / 2), 0);
 
 				delete _menuItem;
 				copyTo(_bgSurface, Common::Rect(0, row, width(), row + MADS_SURFACE_HEIGHT), 0, 0);
@@ -276,7 +274,7 @@
 
 	_bgSurface->copyTo(this, 0, row);
 	M4Sprite *spr = _menuItem->getFrame(_frameIndex);
-	spr->copyTo(this, rexMenuItemPosList[_menuItemIndex - 1].x, rexMenuItemPosList[_menuItemIndex - 1].y +
+	spr->copyTo(this, _menuItemPosList[_menuItemIndex - 1].x, _menuItemPosList[_menuItemIndex - 1].y +
 		row + (itemSize / 2) - (spr->height() / 2), 0);
 }
 
@@ -284,7 +282,7 @@
 	y -= (height() - MADS_SURFACE_HEIGHT) / 2;
 
 	for (int index = 0; index < 6; ++index) {
-		const Common::Point &pt = rexMenuItemPosList[index];
+		const Common::Point &pt = _menuItemPosList[index];
 		M4Sprite *spr = _menuItem->getFrame(index);
 
 		if ((x >= pt.x) && (y >= pt.y) && (x < (pt.x + spr->width())) && (y < (pt.y + spr->height())))
@@ -376,6 +374,14 @@
 	this->loadBackground(942, &_bgPalData);
 	_vm->_palette->addRange(_bgPalData);
 	this->translate(_bgPalData);
+
+	// Set up the menu item pos list
+	_menuItemPosList[0] = Common::Point(46, 187);
+	_menuItemPosList[1] = Common::Point(92, 187);
+	_menuItemPosList[2] = Common::Point(138, 187);
+	_menuItemPosList[3] = Common::Point(184, 187);
+	_menuItemPosList[4] = Common::Point(230, 187);
+	_menuItemPosList[5] = Common::Point(276, 187);
 }
 
 DragonMainMenuView::~DragonMainMenuView() {
@@ -535,7 +541,7 @@
 	y -= (height() - MADS_SURFACE_HEIGHT) / 2;
 
 	for (int index = 0; index < 6; ++index) {
-		const Common::Point &pt = dragonMenuItemPosList[index];
+		const Common::Point &pt = _menuItemPosList[index];
 		M4Sprite *spr = _menuItem->getFrame(0);
 
 		if ((x >= pt.x - 25) && (y >= pt.y - spr->height()) && (x < (pt.x - 25 + spr->width())) && (y < (pt.y)))  {

Modified: scummvm/trunk/engines/m4/mads_menus.h
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.h	2010-05-15 00:28:44 UTC (rev 49034)
+++ scummvm/trunk/engines/m4/mads_menus.h	2010-05-15 00:42:56 UTC (rev 49035)
@@ -41,6 +41,8 @@
 
 class RexMainMenuView : public View {
 private:
+	Common::Point _menuItemPosList[6];
+private:
 	M4Surface *_bgSurface;
 	RGBList *_bgPalData;
 	int _menuItemIndex;
@@ -63,6 +65,8 @@
 
 class DragonMainMenuView : public View {
 private:
+	Common::Point _menuItemPosList[6];
+private:
 	//M4Surface *_bgSurface;
 	RGBList *_bgPalData;
 	int _menuItemIndex;


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

Revision: 49045
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49045&view=rev
Author:   dreammaster
Date:     2010-05-16 01:32:46 +0000 (Sun, 16 May 2010)

Log Message:
-----------
Bugfixes for animation depth logic

Modified Paths:
--------------
    scummvm/trunk/engines/m4/mads_logic.cpp
    scummvm/trunk/engines/m4/mads_views.cpp
    scummvm/trunk/engines/m4/mads_views.h
    scummvm/trunk/engines/m4/rails.cpp
    scummvm/trunk/engines/m4/rails.h

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-15 21:28:26 UTC (rev 49044)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-16 01:32:46 UTC (rev 49045)
@@ -79,29 +79,29 @@
 
 uint16 MadsSceneLogic::startSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks) {
 	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(1);
-	uint8 pixel = *_madsVm->scene()->getWalkSurface()->getBasePtr(spriteFrame->x + (spriteFrame->width() / 2),
-		spriteFrame->y + (spriteFrame->height() / 2));
+	uint8 depth = _madsVm->_rails->getDepth(Common::Point(spriteFrame->x + (spriteFrame->width() / 2),
+		spriteFrame->y + (spriteFrame->height() / 2)));
 
 	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
-		-1, 100, (int)pixel - 1, 1, ANIMTYPE_SINGLE_DIRECTION, 0, 0);
+		-1, 100, depth - 1, 1, ANIMTYPE_SINGLE_DIRECTION, 0, 0);
 }
 
 uint16 MadsSceneLogic::startCycledSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks) {
 	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(1);
-	uint8 pixel = *_madsVm->scene()->getWalkSurface()->getBasePtr(spriteFrame->x + (spriteFrame->width() / 2),
-		spriteFrame->y + (spriteFrame->height() / 2));
+	uint8 depth = _madsVm->_rails->getDepth(Common::Point(spriteFrame->x + (spriteFrame->width() / 2),
+		spriteFrame->y + (spriteFrame->height() / 2)));
 
 	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
-		-1, 100, (int)pixel - 1, 1, ANIMTYPE_CYCLED, 0, 0);
+		-1, 100, depth - 1, 1, ANIMTYPE_CYCLED, 0, 0);
 }
 
 uint16 MadsSceneLogic::startSpriteSequence3(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks) {
 	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(1);
-	uint8 pixel = *_madsVm->scene()->getWalkSurface()->getBasePtr(spriteFrame->x + (spriteFrame->width() / 2),
-		spriteFrame->y + (spriteFrame->height() / 2));
+	uint8 depth = _madsVm->_rails->getDepth(Common::Point(spriteFrame->x + (spriteFrame->width() / 2),
+		spriteFrame->y + (spriteFrame->height() / 2)));
 
 	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
-		-1, 100, (int)pixel - 1, -1, ANIMTYPE_SINGLE_DIRECTION, 0, 0);
+		-1, 100, depth - 1, -1, ANIMTYPE_SINGLE_DIRECTION, 0, 0);
 }
 
 void MadsSceneLogic::activateHotspot(int idx, bool active) {

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-05-15 21:28:26 UTC (rev 49044)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-05-16 01:32:46 UTC (rev 49045)
@@ -258,7 +258,7 @@
 	_talkFont = _vm->_font->getFont(FONT_CONVERSATION_MADS);
 }
 
-int MadsKernelMessageList::add(const Common::Point &pt, uint fontColour, uint8 flags, uint8 v2, uint32 timeout, char *msg) {
+int MadsKernelMessageList::add(const Common::Point &pt, uint fontColour, uint8 flags, uint8 v2, uint32 timeout, const char *msg) {
 	// Find a free slot
 	uint idx = 0;
 	while ((idx < _entries.size()) && ((_entries[idx].flags & KMSG_ACTIVE) != 0))
@@ -291,6 +291,11 @@
 	return idx;
 }
 
+int MadsKernelMessageList::addQuote(int quoteId, int v2, uint32 timeout) {
+	const char *quoteStr = _madsVm->globals()->getQuote(quoteId);
+	return add(Common::Point(0, 0), 0x1110, KMSG_2 | KMSG_20, v2, timeout, quoteStr);
+}
+
 void MadsKernelMessageList::unk1(int msgIndex, int v1, int v2) {
 	if (msgIndex < 0)
 		return;
@@ -322,8 +327,8 @@
 
 	if (rec.flags & KMSG_ACTIVE) {
 		if (rec.flags & KMSG_8) {
-			*(rec.msg + rec.msgOffset) = rec.asciiChar;
-			*(rec.msg + rec.msgOffset + 1) = rec.asciiChar2;
+			//*(rec.msg + rec.msgOffset) = rec.asciiChar;
+			//*(rec.msg + rec.msgOffset + 1) = rec.asciiChar2;
 		}
 
 		if (rec.textDisplayIndex >= 0)
@@ -497,7 +502,7 @@
 }
 
 int MadsSequenceList::add(int spriteListIndex, int v0, int frameIndex, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
-		int height, int width, char field_12, char scale, char depth, int frameInc, SpriteAnimType animType, int numSprites, 
+		int height, int width, char field_12, char scale, uint8 depth, int frameInc, SpriteAnimType animType, int numSprites, 
 		int frameStart) {
 
 	// Find a free slot

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-05-15 21:28:26 UTC (rev 49044)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-05-16 01:32:46 UTC (rev 49045)
@@ -131,7 +131,7 @@
 #define TIMED_TEXT_SIZE 10
 #define TEXT_4A_SIZE 30
 
-enum KernelMessageFlags {KMSG_1 = 1, KMSG_2 = 2, KMSG_4 = 4, KMSG_8 = 8, KMSG_40 = 0x40, KMSG_ACTIVE = 0x80};
+enum KernelMessageFlags {KMSG_1 = 1, KMSG_2 = 2, KMSG_4 = 4, KMSG_8 = 8, KMSG_20 = 0x20, KMSG_40 = 0x40, KMSG_ACTIVE = 0x80};
 
 class MadsKernelMessageListEntry {
 public:
@@ -151,7 +151,7 @@
 	bool field_1C;
 	AbortTimerMode abortMode;
 	uint16 actionNouns[3];
-	char *msg;
+	const char *msg;
 };
 
 class MadsKernelMessageList {
@@ -163,7 +163,8 @@
 	MadsKernelMessageList(MadsView &owner);
 
 	void clear();
-	int add(const Common::Point &pt, uint fontColour, uint8 flags, uint8 v2, uint32 timeout, char *msg);
+	int add(const Common::Point &pt, uint fontColour, uint8 flags, uint8 v2, uint32 timeout, const char *msg);
+	int addQuote(int quoteId, int v2, uint32 timeout);
 	void unk1(int msgIndex, int v1, int v2);
 	void setSeqIndex(int msgIndex, int seqIndex);
 	void remove(int msgIndex);
@@ -295,7 +296,7 @@
 	void clear();
 	bool addSubEntry(int index, SequenceSubEntryMode mode, int frameIndex, int abortVal);
 	int add(int spriteListIndex, int v0, int v1, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
-		int height, int width, char field_12, char scale, char depth, int frameInc, SpriteAnimType animType, 
+		int height, int width, char field_12, char scale, uint8 depth, int frameInc, SpriteAnimType animType, 
 		int numSprites, int frameStart);
 	void remove(int timerIndex);
 	void setSpriteSlot(int timerIndex, MadsSpriteSlot &spriteSlot);

Modified: scummvm/trunk/engines/m4/rails.cpp
===================================================================
--- scummvm/trunk/engines/m4/rails.cpp	2010-05-15 21:28:26 UTC (rev 49044)
+++ scummvm/trunk/engines/m4/rails.cpp	2010-05-16 01:32:46 UTC (rev 49045)
@@ -95,6 +95,12 @@
 	return isWalkableData.result;
 }
 
+uint8 Rails::getDepth(const Common::Point &pt) {
+	// TODO: Check based on sceneResources
+	const byte *b = _walkCodes->getBasePtr(pt.x, pt.y);
+	return *b & 0xf;
+}
+
 // helper function
 uint8 getEndCode(int32 x, int32 y, Common::Rect rect) {
 	uint8 endCode = 0;

Modified: scummvm/trunk/engines/m4/rails.h
===================================================================
--- scummvm/trunk/engines/m4/rails.h	2010-05-15 21:28:26 UTC (rev 49044)
+++ scummvm/trunk/engines/m4/rails.h	2010-05-16 01:32:46 UTC (rev 49045)
@@ -72,6 +72,7 @@
 	void setCodeSurface(M4Surface *surface) { _walkCodes = surface; }
 	void clearRails();
 	int32 addRailNode(int32 x, int32 y, bool restoreEdges);
+	uint8 getDepth(const Common::Point &pt);
 
 private:
 	Common::Array<RailNode *> _nodes;


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

Revision: 49057
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49057&view=rev
Author:   dreammaster
Date:     2010-05-17 10:30:17 +0000 (Mon, 17 May 2010)

Log Message:
-----------
Bugfixes for animation display, and better understanding of how animations cycle

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

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2010-05-17 09:32:16 UTC (rev 49056)
+++ scummvm/trunk/engines/m4/m4.cpp	2010-05-17 10:30:17 UTC (rev 49057)
@@ -583,13 +583,15 @@
 
 		_animation->updateAnim();
 
-		// Call the updateState method of all views
-		_viewManager->updateState();
-
 		if (g_system->getMillis() >= nextFrame) {
-			_viewManager->refreshAll();
 			nextFrame = g_system->getMillis() + GAME_FRAME_DELAY;
 			++_currentTimer;
+
+			// Call the updateState method of all views
+			_viewManager->updateState();
+
+			// Refresh the display
+			_viewManager->refreshAll();
 		}
 
 		g_system->delayMillis(10);

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-17 09:32:16 UTC (rev 49056)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-17 10:30:17 UTC (rev 49057)
@@ -77,31 +77,32 @@
 	return _madsVm->scene()->loadSceneSpriteSet(resName);
 }
 
-uint16 MadsSceneLogic::startSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks) {
+uint16 MadsSceneLogic::startReversibleSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int triggerCountdown, int timeoutTicks, int extraTicks) {
 	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(1);
 	uint8 depth = _madsVm->_rails->getDepth(Common::Point(spriteFrame->x + (spriteFrame->width() / 2),
 		spriteFrame->y + (spriteFrame->height() / 2)));
 
-	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
-		-1, 100, depth - 1, 1, ANIMTYPE_SINGLE_DIRECTION, 0, 0);
+	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, triggerCountdown, timeoutTicks, extraTicks, numTicks, 0, 0, 
+		-1, 100, depth - 1, 1, ANIMTYPE_REVERSIBLE, 0, 0);
 }
 
-uint16 MadsSceneLogic::startCycledSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks) {
+uint16 MadsSceneLogic::startCycledSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int triggerCountdown, int timeoutTicks, int extraTicks) {
 	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(1);
+warning("%d %dx%d %d/%d", srcSpriteIdx, spriteFrame->x, spriteFrame->y, spriteFrame->width(), spriteFrame->height());
 	uint8 depth = _madsVm->_rails->getDepth(Common::Point(spriteFrame->x + (spriteFrame->width() / 2),
 		spriteFrame->y + (spriteFrame->height() / 2)));
 
-	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
+	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, triggerCountdown, timeoutTicks, extraTicks, numTicks, 0, 0, 
 		-1, 100, depth - 1, 1, ANIMTYPE_CYCLED, 0, 0);
 }
 
-uint16 MadsSceneLogic::startSpriteSequence3(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks) {
+uint16 MadsSceneLogic::startSpriteSequence3(uint16 srcSpriteIdx, int v0, int numTicks, int triggerCountdown, int timeoutTicks, int extraTicks) {
 	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(1);
 	uint8 depth = _madsVm->_rails->getDepth(Common::Point(spriteFrame->x + (spriteFrame->width() / 2),
 		spriteFrame->y + (spriteFrame->height() / 2)));
 
-	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, fld24, timeoutTicks, extraTicks, numTicks, 0, 0, 
-		-1, 100, depth - 1, -1, ANIMTYPE_SINGLE_DIRECTION, 0, 0);
+	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, triggerCountdown, timeoutTicks, extraTicks, numTicks, 0, 0, 
+		-1, 100, depth - 1, -1, ANIMTYPE_CYCLED, 0, 0);
 }
 
 void MadsSceneLogic::activateHotspot(int idx, bool active) {
@@ -184,20 +185,21 @@
 	_spriteIndexes[12] = loadSpriteSet(8, 'x');
 	_spriteIndexes[13] = loadSpriteSet(0, 'x');
 
-	_spriteIndexes[15] = startSpriteSequence(_spriteIndexes[0], 0, 5, 0, 0, 25);
-	_spriteIndexes[16] = startSpriteSequence(_spriteIndexes[1], 0, 4, 0, 1, 0);
-	_spriteIndexes[17] = startSpriteSequence(_spriteIndexes[2], 0, 4, 0, 1, 0);
+	_spriteIndexes[15] = startCycledSpriteSequence(_spriteIndexes[0], 0, 5, 0, 0, 25);
 
-	_madsVm->scene()->_sequenceList.addSubEntry(0, SM_FRAME_INDEX, 7, 70);
+	_spriteIndexes[16] = startCycledSpriteSequence(_spriteIndexes[1], 0, 4, 0, 1, 0);
+	_spriteIndexes[17] = startCycledSpriteSequence(_spriteIndexes[2], 0, 4, 0, 1, 0);
 
-	_spriteIndexes[18] = startCycledSpriteSequence(_spriteIndexes[3], 0, 10, 0, 0, 60);
-	_spriteIndexes[19] = startSpriteSequence(_spriteIndexes[4], 0, 5, 0, 1, 0);
-	_spriteIndexes[20] = startSpriteSequence(_spriteIndexes[5], 0, 10, 0, 2, 0);
-	_spriteIndexes[21] = startSpriteSequence(_spriteIndexes[6], 0, 6, 0, 0, 0);
+//	_madsVm->scene()->_sequenceList.addSubEntry(_spriteIndexes[17], SM_FRAME_INDEX, 7, 70);
 
-	_spriteIndexes[23] = startSpriteSequence(_spriteIndexes[8], 0, 6, 0, 10, 4);
-	_spriteIndexes[24] = startSpriteSequence(_spriteIndexes[9], 0, 6, 0, 32, 47);
+	_spriteIndexes[18] = startReversibleSpriteSequence(_spriteIndexes[3], 0, 10, 0, 0, 60);
+	_spriteIndexes[19] = startCycledSpriteSequence(_spriteIndexes[4], 0, 5, 0, 1, 0);
+	_spriteIndexes[20] = startCycledSpriteSequence(_spriteIndexes[5], 0, 10, 0, 2, 0);
+	_spriteIndexes[21] = startCycledSpriteSequence(_spriteIndexes[6], 0, 6, 0, 0, 0);
 
+	_spriteIndexes[23] = startCycledSpriteSequence(_spriteIndexes[8], 0, 6, 0, 10, 4);
+	_spriteIndexes[24] = startCycledSpriteSequence(_spriteIndexes[9], 0, 6, 0, 32, 47);
+
 	activateHotspot(0x137, false);		// SHIELD MODULATOR
 	// shield_panel_opened = 0;
 

Modified: scummvm/trunk/engines/m4/mads_logic.h
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.h	2010-05-17 09:32:16 UTC (rev 49056)
+++ scummvm/trunk/engines/m4/mads_logic.h	2010-05-17 10:30:17 UTC (rev 49057)
@@ -35,9 +35,9 @@
 private:
 	// Library interface methods
 	uint16 loadSpriteSet(uint16 suffixNum, uint16 sepChar);
-	uint16 startSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks);
-	uint16 startCycledSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks);
-	uint16 startSpriteSequence3(uint16 srcSpriteIdx, int v0, int numTicks, int fld24, int timeoutTicks, int extraTicks);
+	uint16 startReversibleSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int triggerCountdown, int timeoutTicks, int extraTicks);
+	uint16 startCycledSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int triggerCountdown, int timeoutTicks, int extraTicks);
+	uint16 startSpriteSequence3(uint16 srcSpriteIdx, int v0, int numTicks, int triggerCountdown, int timeoutTicks, int extraTicks);
 	void activateHotspot(int idx, bool active);
 	void lowRoomsEntrySound();
 private:

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-05-17 09:32:16 UTC (rev 49056)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-05-17 10:30:17 UTC (rev 49057)
@@ -121,7 +121,7 @@
 			// Minimalised drawing
 			assert(slot.spriteListIndex < (int)_sprites.size());
 			M4Sprite *spr = spriteSet.getFrame(slot.frameNumber - 1);
-			spr->draw1(view, slot.scale, slot.depth, slot.xp, MADS_Y_OFFSET + slot.yp);
+			spr->draw1(view, slot.scale, slot.depth, slot.xp, slot.yp);
 		} else {
 			int xp, yp;
 			M4Sprite *spr = spriteSet.getFrame(slot.frameNumber - 1);
@@ -135,9 +135,9 @@
 			}
 
 			if (slot.depth > 1) {
-				spr->draw2(view, slot.depth, xp, MADS_Y_OFFSET + yp);
+				spr->draw2(view, slot.depth, xp, yp);
 			} else {
-				spr->draw3(view, xp, MADS_Y_OFFSET + yp);
+				spr->draw3(view, xp, yp);
 			}
 		}
 	}
@@ -501,7 +501,7 @@
 	return false;
 }
 
-int MadsSequenceList::add(int spriteListIndex, int v0, int frameIndex, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
+int MadsSequenceList::add(int spriteListIndex, int v0, int frameIndex, int triggerCountdown, int delayTicks, int extraTicks, int numTicks, 
 		int height, int width, char field_12, char scale, uint8 depth, int frameInc, SpriteAnimType animType, int numSprites, 
 		int frameStart) {
 
@@ -536,10 +536,10 @@
 	_entries[timerIndex].numTicks = numTicks;
 	_entries[timerIndex].extraTicks = extraTicks;
 
-	_entries[timerIndex].timeout = _madsVm->_currentTimer + timeoutTicks;
+	_entries[timerIndex].timeout = _madsVm->_currentTimer + delayTicks;
 
-	_entries[timerIndex].field_24 = field_24;
-	_entries[timerIndex].field_25 = 0;
+	_entries[timerIndex].triggerCountdown = triggerCountdown;
+	_entries[timerIndex].doneFlag = false;
 	_entries[timerIndex].field_13 = 0;
 	_entries[timerIndex].dynamicHotspotIndex = -1;
 	_entries[timerIndex].entries.count = 0;
@@ -589,13 +589,14 @@
 	int idx = -1;
 
 	_owner._spriteSlots.deleteTimer(timerIndex);
-	if (seqEntry.field_25 != 0) {
+	if (seqEntry.doneFlag) {
 		remove(timerIndex);
 		return false;
 	}
 
 	if (seqEntry.spriteListIndex == -1) {
-		seqEntry.field_25 = -1;
+		// Doesn't have an associated sprite anymore, so mark as done
+		seqEntry.doneFlag = true;
 	} else if ((slotIndex = _owner._spriteSlots.getIndex()) >= 0) {
 		MadsSpriteSlot &spriteSlot = _owner._spriteSlots[slotIndex];
 		setSpriteSlot(timerIndex, spriteSlot);
@@ -631,17 +632,17 @@
 		if (seqEntry.frameIndex >= seqEntry.frameStart) {
 			if (seqEntry.frameIndex > seqEntry.numSprites) {
 				result = true;
-				if (seqEntry.animType != ANIMTYPE_CYCLED) {
-					// Keep index from exceeding maximum allowed
+				if (seqEntry.animType == ANIMTYPE_CYCLED) {
+					// Reset back to the starting frame (cyclic)
 					seqEntry.frameIndex = seqEntry.frameStart;
 				} else {
-					// Switch into reverse
+					// Switch into reverse mode
 					seqEntry.frameIndex = seqEntry.numSprites - 1;
 					seqEntry.frameInc = -1;
 				}
 			}
 		} else {
-			// Currently in reverse mode
+			// Currently in reverse mode and moved past starting frame
 			result = true;
 
 			if (seqEntry.animType == ANIMTYPE_CYCLED)
@@ -655,13 +656,13 @@
 			}
 		}
 
-		if (result && (seqEntry.field_24 != 0)) {
-			if (--seqEntry.field_24 != 0)
-				seqEntry.field_25 = -1;
+		if (result && (seqEntry.triggerCountdown != 0)) {
+			if (--seqEntry.triggerCountdown == 0)
+				seqEntry.doneFlag = true;
 		}
 	} else {
-		// Out of sprite slots
-		seqEntry.field_25 = -1;
+		// Out of sprite display slots, so mark entry as done
+		seqEntry.doneFlag = true;
 	}
 
 	if (seqEntry.entries.count > 0) {
@@ -669,7 +670,7 @@
 			switch (seqEntry.entries.mode[i]) {
 			case SM_0:
 			case SM_1:
-				if (((seqEntry.entries.mode[i] == SM_0) && (seqEntry.field_25 != 0)) ||
+				if (((seqEntry.entries.mode[i] == SM_0) && seqEntry.doneFlag) ||
 					((seqEntry.entries.mode[i] == SM_1) && result))
 				idx = i;
 				break;
@@ -702,18 +703,18 @@
 		if ((_owner._abortTimers2 == 0) && (_owner._abortTimers != 0))
 			break;
 
-		MadsSequenceEntry &timerEntry = _entries[idx];
+		MadsSequenceEntry &seqEntry = _entries[idx];
 		uint32 currentTimer = _madsVm->_currentTimer;
 
-		if (!timerEntry.active || (currentTimer < timerEntry.timeout))
+		if (!seqEntry.active || (currentTimer < seqEntry.timeout))
 			continue;
 
 		// Set the next timeout for the timer entry
-		timerEntry.timeout = currentTimer + timerEntry.numTicks;		
+		seqEntry.timeout = currentTimer + seqEntry.numTicks;		
 
 		// Action the sprite
 		if (loadSprites(idx)) {
-			timerEntry.timeout += timerEntry.extraTicks;
+			seqEntry.timeout += seqEntry.extraTicks;
 		}
 	}
 }

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-05-17 09:32:16 UTC (rev 49056)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-05-17 10:30:17 UTC (rev 49057)
@@ -236,7 +236,7 @@
 	void reset();
 };
 
-enum SpriteAnimType {ANIMTYPE_SINGLE_DIRECTION = 1, ANIMTYPE_CYCLED = 2};
+enum SpriteAnimType {ANIMTYPE_CYCLED = 1, ANIMTYPE_REVERSIBLE = 2};
 
 enum SequenceSubEntryMode {SM_0 = 0, SM_1 = 1, SM_FRAME_INDEX = 2};
 
@@ -272,8 +272,8 @@
 	int width;
 	int height;
 	
-	int field_24;
-	int field_25;
+	int triggerCountdown;
+	bool doneFlag;
 	MadsSequenceSubEntries entries;
 	AbortTimerMode abortMode;
 
@@ -295,7 +295,7 @@
 	MadsSequenceEntry &operator[](int index) { return _entries[index]; }	
 	void clear();
 	bool addSubEntry(int index, SequenceSubEntryMode mode, int frameIndex, int abortVal);
-	int add(int spriteListIndex, int v0, int v1, char field_24, int timeoutTicks, int extraTicks, int numTicks, 
+	int add(int spriteListIndex, int v0, int v1, int triggerCountdown, int delayTicks, int extraTicks, int numTicks, 
 		int height, int width, char field_12, char scale, uint8 depth, int frameInc, SpriteAnimType animType, 
 		int numSprites, int frameStart);
 	void remove(int timerIndex);


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

Revision: 49150
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49150&view=rev
Author:   dreammaster
Date:     2010-05-23 07:20:40 +0000 (Sun, 23 May 2010)

Log Message:
-----------
Major work done on the animation and support classes to match the original

Modified Paths:
--------------
    scummvm/trunk/engines/m4/assets.cpp
    scummvm/trunk/engines/m4/assets.h
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/m4/graphics.cpp
    scummvm/trunk/engines/m4/graphics.h
    scummvm/trunk/engines/m4/mads_logic.cpp
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/mads_scene.cpp
    scummvm/trunk/engines/m4/mads_scene.h
    scummvm/trunk/engines/m4/mads_views.cpp
    scummvm/trunk/engines/m4/mads_views.h
    scummvm/trunk/engines/m4/sprite.h

Modified: scummvm/trunk/engines/m4/assets.cpp
===================================================================
--- scummvm/trunk/engines/m4/assets.cpp	2010-05-23 05:51:32 UTC (rev 49149)
+++ scummvm/trunk/engines/m4/assets.cpp	2010-05-23 07:20:40 UTC (rev 49150)
@@ -195,7 +195,9 @@
 	_maxHeight = 0;
 
 	Common::SeekableReadStream *spriteStream = sprite.getItemStream(0);
-	for (int i = 0; i < 19; i++) {
+
+	_assetType = spriteStream->readUint16LE();
+	for (int i = 0; i < 18; i++) {
 		spriteStream->readUint16LE();
 	}
 	_frameCount = spriteStream->readUint16LE();

Modified: scummvm/trunk/engines/m4/assets.h
===================================================================
--- scummvm/trunk/engines/m4/assets.h	2010-05-23 05:51:32 UTC (rev 49149)
+++ scummvm/trunk/engines/m4/assets.h	2010-05-23 07:20:40 UTC (rev 49150)
@@ -113,6 +113,7 @@
 	int32 getFrameHeight(int index);
 	int32 getMaxFrameWidth() const { return _maxWidth; }
 	int32 getMaxFrameHeight() const { return _maxHeight; }
+	uint16 getAssetType() const { return _assetType; }
 	M4Sprite *getFrame(int frameIndex);
 	void loadStreamingFrame(M4Sprite *frame, int frameIndex, int destX, int destY);
 	RGB8* getPalette() { return _palette; }
@@ -123,6 +124,7 @@
 	int32 getFrameSize(int index);
 	M4Sprite *operator[](int index) { return getFrame(index); }
 protected:
+	Common::SeekableReadStream *_stream;
 	RGB8 _palette[256];
 	uint32 _colorCount;
 	uint32 _srcSize;
@@ -132,7 +134,10 @@
 	Common::Array<uint32> _frameOffsets;
 	Common::Array<SpriteAssetFrame> _frames;
 	uint32 _frameStartOffset;
-	Common::SeekableReadStream *_stream;
+	
+	// MADS sprite set fields
+	uint16 _assetType;
+
 	int32 parseSprite(bool isBigEndian = false);
 	void loadFrameHeader(SpriteAssetFrame &frameHeader, bool isBigEndian = false);
 private:

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2010-05-23 05:51:32 UTC (rev 49149)
+++ scummvm/trunk/engines/m4/globals.h	2010-05-23 07:20:40 UTC (rev 49150)
@@ -264,6 +264,7 @@
 	// DEPRECATED: ScummVM re-implementation keeps all the quotes loaded, so the methods below are stubs
 	void clearQuotes() {}
 	void loadQuoteRange(int startNum, int endNum) {}
+	void loadQuoteSet(...) {}
 	void loadQuote(int quoteNum) {}
 
 	void loadMadsMessagesInfo();

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2010-05-23 05:51:32 UTC (rev 49149)
+++ scummvm/trunk/engines/m4/graphics.cpp	2010-05-23 07:20:40 UTC (rev 49150)
@@ -333,7 +333,7 @@
 }
 
 void M4Surface::copyFrom(M4Surface *src, const Common::Rect &srcBounds, int destX, int destY,
-						 int transparentColor) {
+						 int transparentColour) {
 	// Validation of the rectangle and position
 	if ((destX >= w) || (destY >= h))
 		return;
@@ -362,13 +362,13 @@
 	byte *destPtr = (byte *)pixels + (destY * width()) + destX;
 
 	for (int rowCtr = 0; rowCtr < copyRect.height(); ++rowCtr) {
-		if (transparentColor == -1)
+		if (transparentColour == -1)
 			// No transparency, so copy line over
 			Common::copy(srcPtr, srcPtr + copyRect.width(), destPtr);
 		else {
 			// Copy each byte one at a time checking for the transparency color
 			for (int xCtr = 0; xCtr < copyRect.width(); ++xCtr)
-				if (srcPtr[xCtr] != transparentColor) destPtr[xCtr] = srcPtr[xCtr];
+				if (srcPtr[xCtr] != transparentColour) destPtr[xCtr] = srcPtr[xCtr];
 		}
 
 		srcPtr += src->width();
@@ -378,6 +378,81 @@
 	src->freeData();
 }
 
+/**
+ * Copies a given image onto a destination surface with scaling, transferring only pixels that meet
+ * the specified depth requirement on a secondary surface contain depth information
+ */
+void M4Surface::copyFrom(M4Surface *src, int destX, int destY, int depth, M4Surface *depthsSurface, 
+						 int scale, int transparentColour) {
+	/* TODO: This isn't a straight re-implementation of the original draw routine. Double check in future
+	 * whether this implementation provides equivalent functionality
+	 */
+	Common::Rect copyRect(0, 0, src->width(), src->height());
+
+	if (destX < 0) {
+		copyRect.left += -destX;
+		destX = 0;
+	} else if (destX + copyRect.width() > w) {
+		copyRect.right -= destX + copyRect.width() - w;
+	}
+	if (destY < 0) {
+		copyRect.top += -destY;
+		destY = 0;
+	} else if (destY + copyRect.height() > h) {
+		copyRect.bottom -= destY + copyRect.height() - h;
+	}
+
+	if (!copyRect.isValidRect())
+		return;
+
+	// Copy the specified area
+
+	byte *data = src->getBasePtr();
+	byte *srcPtr = data + (src->width() * copyRect.top + copyRect.left);
+	byte *depthsData = depthsSurface->getBasePtr();
+	byte *depthsPtr = depthsData + (src->width() * copyRect.top + copyRect.left);
+	byte *destPtr = (byte *)pixels + (destY * width()) + destX;
+
+	if (scale == 100) {
+		// 100% scaling variation
+		for (int rowCtr = 0; rowCtr < copyRect.height(); ++rowCtr) {
+			// Copy each byte one at a time checking against the depth
+			for (int xCtr = 0; xCtr < copyRect.width(); ++xCtr) {
+				if ((depthsPtr[xCtr] > depth) && (srcPtr[xCtr] != transparentColour))
+					destPtr[xCtr] = srcPtr[xCtr];
+			}
+
+			srcPtr += src->width();
+			depthsPtr += depthsSurface->width();
+			destPtr += width();
+		}
+	} else {
+		// Scaled variation
+		for (int rowCtr = 0; rowCtr < copyRect.height(); ++rowCtr) {
+			int currX = -1;
+
+			// Loop through the source pixels
+			for (int xCtr = 0, xTotal = 0; xCtr < copyRect.width(); ++xCtr, xTotal += (100 - scale)) {
+				int srcX = xTotal / 100;
+
+				if (srcX != currX) {
+					currX = srcX;
+
+					if ((depthsPtr[currX] > depth) && (srcPtr[xCtr] != transparentColour))
+						destPtr[currX] = srcPtr[xCtr];
+				}
+			}
+
+			srcPtr += src->width();
+			depthsPtr += depthsSurface->width();
+			destPtr += width();
+		}
+	}
+
+	src->freeData();
+	depthsSurface->freeData();	
+}
+
 void M4Surface::loadBackgroundRiddle(const char *sceneName) {
 	char resourceName[20];
 	Common::SeekableReadStream *stream;

Modified: scummvm/trunk/engines/m4/graphics.h
===================================================================
--- scummvm/trunk/engines/m4/graphics.h	2010-05-23 05:51:32 UTC (rev 49149)
+++ scummvm/trunk/engines/m4/graphics.h	2010-05-23 07:20:40 UTC (rev 49150)
@@ -145,8 +145,10 @@
 	void clear();
 	void frameRect(const Common::Rect &r, uint8 color);
 	void fillRect(const Common::Rect &r, uint8 color);
-	void copyFrom(M4Surface *src, const Common::Rect &srcBounds, int destX, int destY,
-		int transparentColor = -1);
+	void copyFrom(M4Surface *src, const Common::Rect &srcBounds, int destX, int destY, 
+			int transparentColour = -1);
+	void copyFrom(M4Surface *src, int destX, int destY, int depth, M4Surface *depthSurface, int scale,
+			int transparentColour = -1);
 
 	void update() {
 		if (_isScreen) {
@@ -156,17 +158,23 @@
 	}
 
 	// copyTo methods
-	inline void copyTo(M4Surface *dest, int transparentColor = -1) {
-		dest->copyFrom(this, Common::Rect(width(), height()), 0, 0, transparentColor);
+	inline void copyTo(M4Surface *dest, int transparentColour = -1) {
+		dest->copyFrom(this, Common::Rect(width(), height()), 0, 0, transparentColour);
 	}
-	inline void copyTo(M4Surface *dest, int x, int y, int transparentColor = -1) {
-		dest->copyFrom(this, Common::Rect(width(), height()), x, y, transparentColor);
+	inline void copyTo(M4Surface *dest, int x, int y, int transparentColour = -1) {
+		dest->copyFrom(this, Common::Rect(width(), height()), x, y, transparentColour);
 	}
 	inline void copyTo(M4Surface *dest, const Common::Rect &srcBounds, int destX, int destY,
-				int transparentColor = -1) {
-		dest->copyFrom(this, srcBounds, destX, destY, transparentColor);
+				int transparentColour = -1) {
+		dest->copyFrom(this, srcBounds, destX, destY, transparentColour);
 	}
+	inline void copyTo(M4Surface *dest, int destX, int destY, int depth, M4Surface *depthsSurface, int scale,
+				int transparentColour = -1) {
+		dest->copyFrom(this, destX, destY, depth, depthsSurface, scale, transparentColour);
+	}
 
+
+
 	void translate(RGBList *list, bool isTransparent = false);
 };
 

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-23 05:51:32 UTC (rev 49149)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-23 07:20:40 UTC (rev 49150)
@@ -78,7 +78,7 @@
 }
 
 uint16 MadsSceneLogic::startReversibleSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int triggerCountdown, int timeoutTicks, int extraTicks) {
-	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(1);
+	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(0);
 	uint8 depth = _madsVm->_rails->getDepth(Common::Point(spriteFrame->x + (spriteFrame->width() / 2),
 		spriteFrame->y + (spriteFrame->height() / 2)));
 
@@ -87,8 +87,7 @@
 }
 
 uint16 MadsSceneLogic::startCycledSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int triggerCountdown, int timeoutTicks, int extraTicks) {
-	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(1);
-warning("%d %dx%d %d/%d", srcSpriteIdx, spriteFrame->x, spriteFrame->y, spriteFrame->width(), spriteFrame->height());
+	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(0);
 	uint8 depth = _madsVm->_rails->getDepth(Common::Point(spriteFrame->x + (spriteFrame->width() / 2),
 		spriteFrame->y + (spriteFrame->height() / 2)));
 
@@ -97,7 +96,7 @@
 }
 
 uint16 MadsSceneLogic::startSpriteSequence3(uint16 srcSpriteIdx, int v0, int numTicks, int triggerCountdown, int timeoutTicks, int extraTicks) {
-	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(1);
+	M4Sprite *spriteFrame = _madsVm->scene()->_spriteSlots.getSprite(srcSpriteIdx).getFrame(0);
 	uint8 depth = _madsVm->_rails->getDepth(Common::Point(spriteFrame->x + (spriteFrame->width() / 2),
 		spriteFrame->y + (spriteFrame->height() / 2)));
 
@@ -160,7 +159,7 @@
 	assert(sceneNum == 101);
 	_sceneNumber = sceneNum;
 
-
+	Common::set_to(&_spriteIndexes[0], &_spriteIndexes[50], 0);
 }
 
 void MadsSceneLogic::setupScene() {
@@ -206,11 +205,39 @@
 	if (_madsVm->globals()->previousScene != -1)
 		_madsVm->globals()->_globals[10] = 0;
 	if (_madsVm->globals()->previousScene != -2) {
-		//playerPos = (100, 152);
+		_madsVm->scene()->getSceneResources().playerPos = Common::Point(100, 152);
 	}
 	
-	// TODO: EXTRA STUFF
+	if ((_madsVm->globals()->previousScene == 112) || 
+		((_madsVm->globals()->previousScene != -2) && (_spriteIndexes[29] != 0))) {
+		// Returning from probe cutscene?
+		_spriteIndexes[29] = -1;
+		_madsVm->scene()->getSceneResources().playerPos = Common::Point(161, 123);
+		_madsVm->scene()->getSceneResources().playerDir = 9;
 
+		// TODO: Extra flags setting
+		_spriteIndexes[25] = startCycledSpriteSequence(_spriteIndexes[10], 0, 3, 0, 0, 0);
+		_madsVm->scene()->_sequenceList.setAnimRange(_spriteIndexes[25], 17, 17);
+		activateHotspot(0x47, false);	// CHAIR
+		/*timer_unk1 = */_madsVm->scene()->_dynamicHotspots.add(0x47, 0x13F /*SIT_IN*/, -1,
+			Common::Rect(159, 84, 159+33, 84+36));
+		
+		//if (_madsVm->globals()->previousScene == 112)
+		//	room101Check();
+	} else {
+		_spriteIndexes[26] = startCycledSpriteSequence(_spriteIndexes[11], 0, 6, 0, 0, 0);
+	}
+
+	_madsVm->globals()->loadQuoteSet(0x31, 0x32, 0x37, 0x38, 0x39, -1);
+
+	if (_madsVm->globals()->_globals[10]) {
+		// TODO: Load scene animation
+
+		_madsVm->scene()->getSceneResources().playerPos = Common::Point(68, 140);
+		_madsVm->scene()->getSceneResources().playerDir = 4;
+		// TODO: Flags setting
+	}
+
 	lowRoomsEntrySound();
 }
 

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-05-23 05:51:32 UTC (rev 49149)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-05-23 07:20:40 UTC (rev 49150)
@@ -616,9 +616,9 @@
 	}
 	_totalTextEntries = 0;
 
-	// Set up a default sprite slot entry
+	// Set up a default sprite slot entry for a full screen refresh
 	_spriteSlots.startIndex = 1;
-	_spriteSlots[0].spriteId = -2;
+	_spriteSlots[0].spriteType = FULL_SCREEN_REFRESH;
 	_spriteSlots[0].timerIndex = -1;
 }
 
@@ -795,7 +795,7 @@
 
 void RexDialogView::setFrame(int frameNumber, int depth) {
 	int slotIndex = _spriteSlots.getIndex();
-	_spriteSlots[slotIndex].spriteId = 1;
+	_spriteSlots[slotIndex].spriteType = FOREGROUND_SPRITE;
 	_spriteSlots[slotIndex].timerIndex = 1;
 	_spriteSlots[slotIndex].spriteListIndex = 0; //_menuSpritesIndex;
 	_spriteSlots[slotIndex].frameNumber = frameNumber;

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-05-23 05:51:32 UTC (rev 49149)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-05-23 07:20:40 UTC (rev 49150)
@@ -43,6 +43,8 @@
 MadsScene::MadsScene(MadsEngine *vm): _sceneResources(), Scene(vm, &_sceneResources), MadsView(this) {
 	_vm = vm;
 
+	MadsView::_bgSurface = Scene::_backgroundSurface;
+	MadsView::_depthSurface = Scene::_walkSurface;
 	_interfaceSurface = new MadsInterfaceView(vm);
 	for (int i = 0; i < 3; ++i)
 		actionNouns[i] = 0;
@@ -277,9 +279,6 @@
 
 
 void MadsScene::update() {
-	// Copy the bare scene in
-	_backgroundSurface->copyTo(this);
-
 	// Draw all the various elements
 	drawElements();
 

Modified: scummvm/trunk/engines/m4/mads_scene.h
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.h	2010-05-23 05:51:32 UTC (rev 49149)
+++ scummvm/trunk/engines/m4/mads_scene.h	2010-05-23 07:20:40 UTC (rev 49150)
@@ -34,19 +34,7 @@
 
 #define INTERFACE_HEIGHT 106
 
-struct SpriteSlot {
-	int16 spriteId;
-	int16 scale;
-	uint16 spriteListIndex;
-};
 
-struct DirtyArea {
-	bool active;
-	bool active2;
-	Common::Rect bounds;
-};
-
-
 class MadsSceneResources: public SceneResources {
 public:
 	int sceneId;
@@ -60,8 +48,10 @@
 	
 	int walkSize;
 	byte *walkData;
+	Common::Point playerPos;
+	int playerDir;
 
-	MadsSceneResources() { walkSize = 0; walkData = NULL; }
+	MadsSceneResources() { walkSize = 0; walkData = NULL; playerDir = 0; }
 	~MadsSceneResources() { delete walkData; }
 	void load(int sceneId);	
 };
@@ -101,8 +91,6 @@
 	const char *statusText() const { return _statusText; }
 };
 
-#define DIRTY_AREA_SIZE 90
-
 class MadsScene : public Scene, public MadsView {
 private:
 	MadsEngine *_vm;
@@ -111,7 +99,6 @@
 
 	MadsSceneLogic _sceneLogic;
 	SpriteAsset *_playerSprites;
-	DirtyArea _dirtyAreas[DIRTY_AREA_SIZE];
 
 	void drawElements();
 	void loadScene2(const char *aaName);

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-05-23 05:51:32 UTC (rev 49149)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-05-23 07:20:40 UTC (rev 49150)
@@ -43,7 +43,7 @@
 
 //--------------------------------------------------------------------------
 
-MadsSpriteSlots::MadsSpriteSlots() {
+MadsSpriteSlots::MadsSpriteSlots(MadsView &owner): _owner(owner) {
 	for (int i = 0; i < SPRITE_SLOTS_SIZE; ++i) {
 		MadsSpriteSlot rec;
 		_entries.push_back(rec);
@@ -52,6 +52,16 @@
 	startIndex = 0;
 }
 
+void MadsSpriteSlots::clear() {
+	_owner._textDisplay.clear();
+	_sprites.clear();
+
+	// Reset the sprite slots list back to a single entry for a full screen refresh
+	startIndex = 1;
+	_entries[0].spriteType = FULL_SCREEN_REFRESH;
+	_entries[0].timerIndex = -1;
+}
+
 int MadsSpriteSlots::getIndex() {
 	if (startIndex == SPRITE_SLOTS_SIZE)
 		error("Run out of sprite slots");
@@ -77,7 +87,7 @@
 void MadsSpriteSlots::deleteTimer(int timerIndex) {
 	for (int idx = 0; idx < startIndex; ++idx) {
 		if (_entries[idx].timerIndex == timerIndex)
-			_entries[idx].spriteId = -1;
+			_entries[idx].spriteType = -1;
 	}
 }
 
@@ -95,12 +105,49 @@
 
 typedef Common::List<DepthEntry> DepthList;
 
-void MadsSpriteSlots::draw(View *view) {
+void MadsSpriteSlots::drawBackground() {
+	// Draw all active sprites onto the background surface
+	for (int i = 0; i < startIndex; ++i) {
+		if (_entries[i].spriteType >= 0) {
+			_owner._dirtyAreas[i].active = false;
+		} else {
+			_owner._dirtyAreas[i].textActive = true;
+			_owner._dirtyAreas.setSpriteSlot(i, _entries[i]);
+
+			if (_entries[i].spriteType == BACKGROUND_SPRITE) {
+				SpriteAsset &spriteSet = getSprite(_entries[i].spriteListIndex);
+				M4Sprite *frame = spriteSet.getFrame((_entries[i].frameNumber & 0x7fff) - 1);
+				int xp = _entries[i].xp;
+				int yp = _entries[i].yp;
+
+				if (_entries[i].scale != -1) {
+					// Adjust position based on frame size
+					xp -= frame->width() / 2;
+					yp -= frame->height() / 2;
+				}
+
+				if (_entries[i].depth <= 1) {
+					// No depth, so simply copy the frame onto the background
+					frame->copyTo(_owner._bgSurface, xp, yp);
+				} else {
+					// Depth was specified, so draw frame using scene's depth information
+					frame->copyTo(_owner._bgSurface, xp, yp, _entries[i].depth, _owner._depthSurface, 100);
+				}
+			}
+		}
+	}
+
+	// Flag any remaining dirty areas as inactive
+	for (uint i = startIndex; i < DIRTY_AREAS_TEXT_DISPLAY_IDX; ++i)
+		_owner._dirtyAreas[i].active = false;
+}
+
+void MadsSpriteSlots::drawForeground(View *view) {
 	DepthList depthList;
 
 	// Get a list of sprite object depths for active objects
 	for (int i = 0; i < startIndex; ++i) {
-		if (_entries[i].spriteId >= 0) {
+		if (_entries[i].spriteType >= 0) {
 			DepthEntry rec(_entries[i].depth, i);
 			depthList.push_back(rec);
 		}
@@ -121,28 +168,41 @@
 			// Minimalised drawing
 			assert(slot.spriteListIndex < (int)_sprites.size());
 			M4Sprite *spr = spriteSet.getFrame(slot.frameNumber - 1);
-			spr->draw1(view, slot.scale, slot.depth, slot.xp, slot.yp);
+			spr->copyTo(view, slot.xp, slot.yp, slot.depth, _owner._depthSurface, slot.scale, 0);
 		} else {
 			int xp, yp;
 			M4Sprite *spr = spriteSet.getFrame(slot.frameNumber - 1);
 
 			if (slot.scale == -1) {
-				xp = slot.xp; // - widthAdjust;
-				yp = slot.yp; // - heightAdjust;
+				xp = slot.xp - _owner._posAdjust.x;
+				yp = slot.yp - _owner._posAdjust.y;
 			} else {
-				xp = slot.xp - (spr->width() / 2); // - widthAdjust;
-				yp = slot.yp - spr->height() + 1; // - heightAdjust;
+				xp = slot.xp - (spr->width() / 2) - _owner._posAdjust.x;
+				yp = slot.yp - spr->height() - _owner._posAdjust.y + 1;
 			}
 
 			if (slot.depth > 1) {
-				spr->draw2(view, slot.depth, xp, yp);
+				// Draw the frame with depth processing
+				spr->copyTo(view, xp, yp, slot.depth, _owner._depthSurface, 100, 0);
 			} else {
-				spr->draw3(view, xp, yp);
+				// No depth, so simply draw the image
+				spr->copyTo(view, xp, yp, 0);
 			}
 		}
 	}
 }
 
+void MadsSpriteSlots::setDirtyAreas() {
+	for (int i = 0; i < startIndex; ++i) {
+		if (_entries[i].spriteType >= 0) {
+			_owner._dirtyAreas.setSpriteSlot(i, _entries[i]);
+
+			_owner._dirtyAreas[i].textActive = (_entries[i].spriteType <= 0) ? 0 : 1;
+			_entries[i].spriteType = 0;
+		}
+	}
+}
+
 /**
  * Removes any sprite slots that are no longer needed
  */
@@ -150,7 +210,7 @@
 	// Delete any entries that aren't needed
 	int idx = 0;
 	while (idx < startIndex) {
-		if (_entries[idx].spriteId >= 0) {
+		if (_entries[idx].spriteType < 0) {
 			_entries.remove_at(idx);
 			--startIndex;
 		} else {
@@ -168,7 +228,7 @@
 
 //--------------------------------------------------------------------------
 
-MadsTextDisplay::MadsTextDisplay() {
+MadsTextDisplay::MadsTextDisplay(MadsView &owner): _owner(owner) {
 	for (int i = 0; i < TEXT_DISPLAY_SIZE; ++i) {
 		MadsTextDisplayEntry rec;
 		rec.active = false;
@@ -206,6 +266,28 @@
 	return usedSlot;
 }
 
+void MadsTextDisplay::setDirtyAreas() {
+	// Determine dirty areas for active text areas
+	for (uint idx = 0, dirtyIdx = DIRTY_AREAS_TEXT_DISPLAY_IDX; dirtyIdx < DIRTY_AREAS_SIZE; ++idx, ++dirtyIdx) {
+		if ((_entries[idx].expire < 0) || !_entries[idx].active)
+			_owner._dirtyAreas[dirtyIdx].active = false;
+		else {
+			_owner._dirtyAreas[dirtyIdx].textActive = true;
+			_owner._dirtyAreas.setTextDisplay(dirtyIdx, _entries[idx]);
+		}
+	}
+}
+
+void MadsTextDisplay::setDirtyAreas2() {
+	// Determine dirty areas for active text areas
+	for (uint idx = 0, dirtyIdx = DIRTY_AREAS_TEXT_DISPLAY_IDX; dirtyIdx < DIRTY_AREAS_SIZE; ++idx, ++dirtyIdx) {
+		if (_entries[idx].active && (_entries[idx].expire >= 0)) {
+			_owner._dirtyAreas.setTextDisplay(dirtyIdx, _entries[idx]);
+			_owner._dirtyAreas[dirtyIdx].textActive = (_entries[idx].expire <= 0) ? 0 : 1;
+		}
+	}
+}
+
 void MadsTextDisplay::draw(View *view) {
 	for (uint idx = 0; idx < _entries.size(); ++idx) {
 		if (_entries[idx].active && (_entries[idx].expire >= 0)) {
@@ -405,21 +487,23 @@
 	for (int i = 0; i < DYNAMIC_HOTSPOTS_SIZE; ++i) {
 		DynamicHotspot rec;
 		rec.active = false;
+		_entries.push_back(rec);
 	}
 	_flag = true;
 	_count = 0;
 }
 
-int MadsDynamicHotspots::add(int descId, int field14, int timerIndex, const Common::Rect &bounds) {
+int MadsDynamicHotspots::add(int descId, int field14, int seqIndex, const Common::Rect &bounds) {
 	// Find a free slot
 	uint idx = 0;
-	while ((idx < _entries.size()) && !_entries[idx].active)
+	while ((idx < _entries.size()) && _entries[idx].active)
 		++idx;
 	if (idx == _entries.size())
 		error("MadsDynamicHotspots overflow");
 
 	_entries[idx].active = true;
 	_entries[idx].descId = descId;
+	_entries[idx].seqIndex = seqIndex;
 	_entries[idx].bounds = bounds;
 	_entries[idx].pos.x = -3;
 	_entries[idx].pos.y = 0;
@@ -430,8 +514,10 @@
 
 	++_count;
 	_flag = true;
-	_owner._sequenceList[timerIndex].dynamicHotspotIndex = idx;
 
+	if (seqIndex >= 0)
+		_owner._sequenceList[seqIndex].dynamicHotspotIndex = idx;
+
 	return idx;
 }
 
@@ -454,8 +540,8 @@
 
 void MadsDynamicHotspots::remove(int index) {
 	if (_entries[index].active) {
-		if (_entries[index].timerIndex >= 0)
-			_owner._sequenceList[_entries[index].timerIndex].dynamicHotspotIndex = -1;
+		if (_entries[index].seqIndex >= 0)
+			_owner._sequenceList[_entries[index].seqIndex].dynamicHotspotIndex = -1;
 		_entries[index].active = false;
 
 		--_count;
@@ -473,6 +559,143 @@
 
 /*--------------------------------------------------------------------------*/
 
+void MadsDirtyArea::setArea(int width, int height, int maxWidth, int maxHeight) {
+	if (bounds.left % 2) {
+		--bounds.left;
+		++width;
+	}
+	int right = bounds.left + width;
+	if (bounds.left < 0)
+		bounds.left = 0;
+	if (right < 0)
+		right = 0;
+	if (right > maxWidth)
+		right = maxWidth;
+
+	bounds.right = right;
+	bounds2.left = bounds.width() / 2;
+	bounds2.right = bounds.left + (bounds.width() + 1) / 2 - 1;
+
+	if (bounds.top < 0)
+		bounds.top = 0;
+	int bottom = bounds.top + height;
+	if (bottom < 0)
+		bottom = 0;
+	if (bottom > maxHeight)
+		bottom = maxHeight;
+
+	bounds.bottom = bottom;
+	bounds2.top = bounds.height() / 2;
+	bounds2.bottom = bounds.top + (bounds.height() + 1) / 2 - 1;
+
+	active = true;
+}
+
+/*--------------------------------------------------------------------------*/
+
+MadsDirtyAreas::MadsDirtyAreas(MadsView &owner): _owner(owner) {
+	for (int i = 0; i < DIRTY_AREAS_SIZE; ++i) {
+		MadsDirtyArea rec;
+		rec.active = false;
+		_entries.push_back(rec);
+	}
+}
+
+void MadsDirtyAreas::setSpriteSlot(int dirtyIdx, const MadsSpriteSlot &spriteSlot) {
+	int width, height;
+	MadsDirtyArea &dirtyArea = _entries[dirtyIdx];
+
+	if (spriteSlot.spriteType == FULL_SCREEN_REFRESH) {
+		// Special entry to refresh the entire screen
+		dirtyArea.bounds.left = 0;
+		dirtyArea.bounds.top = 0;
+		width = MADS_SURFACE_WIDTH;
+		height = MADS_SURFACE_HEIGHT;
+	} else {
+		// Standard sprite slots
+		dirtyArea.bounds.left = spriteSlot.xp - _owner._posAdjust.x;
+		dirtyArea.bounds.top = spriteSlot.yp - _owner._posAdjust.y;
+
+		SpriteAsset &spriteSet = _owner._spriteSlots.getSprite(spriteSlot.spriteListIndex);
+		M4Sprite *frame = spriteSet.getFrame(((spriteSlot.frameNumber & 0x7fff) - 1) & 0x7f);
+		
+		if (spriteSlot.scale == -1) {
+			width = frame->width();
+			height = frame->height();
+		} else {
+			width = frame->width() * spriteSlot.scale / 100;
+			height = frame->height() * spriteSlot.scale / 100;
+
+			dirtyArea.bounds.left -= width / 2;
+			dirtyArea.bounds.top += -(height - 1);
+		}
+	}
+
+	dirtyArea.setArea(width, height, MADS_SURFACE_WIDTH, MADS_SURFACE_HEIGHT);
+}
+
+void MadsDirtyAreas::setTextDisplay(int dirtyIdx, const MadsTextDisplayEntry &textDisplay) {
+	MadsDirtyArea &dirtyArea = _entries[dirtyIdx];
+	dirtyArea.bounds.left = textDisplay.bounds.left;
+	dirtyArea.bounds.top = textDisplay.bounds.top;
+
+	dirtyArea.setArea(textDisplay.bounds.width(), textDisplay.bounds.height(), MADS_SURFACE_WIDTH, MADS_SURFACE_HEIGHT);
+}
+
+/**
+ * Merge together any designated dirty areas that overlap
+ * @param startIndex	1-based starting dirty area starting index
+ * @param count			Number of entries to process
+ */
+void MadsDirtyAreas::merge(int startIndex, int count) {
+	if (startIndex >= count)
+		return;
+
+	for (int outerCtr = startIndex - 1, idx = 0; idx < count; ++outerCtr, ++idx) {
+		if (!_entries[outerCtr].active)
+			continue;
+
+		for (int innerCtr = outerCtr + 1; innerCtr < count; ++innerCtr) {
+			if (!_entries[innerCtr].active || !intersects(outerCtr, innerCtr))
+				continue;
+
+			if (_entries[outerCtr].textActive && _entries[innerCtr].textActive)
+				mergeAreas(outerCtr, innerCtr);
+		}
+	}
+}
+
+/**
+ * Returns true if two dirty areas intersect
+ */
+bool MadsDirtyAreas::intersects(int idx1, int idx2) {
+	return _entries[idx1].bounds2.intersects(_entries[idx2].bounds2);
+}
+
+void MadsDirtyAreas::mergeAreas(int idx1, int idx2) {
+	MadsDirtyArea &da1 = _entries[idx1];
+	MadsDirtyArea &da2 = _entries[idx2];
+
+	da1.bounds.extend(da2.bounds);
+
+	da1.bounds2.left = da1.bounds.width() / 2;
+	da1.bounds2.right = da1.bounds.left + (da1.bounds.width() + 1) / 2 - 1;
+	da1.bounds2.top = da1.bounds.height() / 2;
+	da1.bounds2.bottom = da1.bounds.top + (da1.bounds.height() + 1) / 2 - 1;
+
+	da2.active = false;
+	da1.textActive = true;
+}
+
+void MadsDirtyAreas::copy(M4Surface *dest, M4Surface *src) {
+	for (uint i = 0; i < _entries.size(); ++i) {
+		if (_entries[i].active && _entries[i].bounds.isValidRect())
+			src->copyTo(dest, _entries[i].bounds, _entries[i].bounds.left, _entries[i].bounds.top);
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
 MadsSequenceList::MadsSequenceList(MadsView &owner): _owner(owner) {
 	for (int i = 0; i < TIMER_LIST_SIZE; ++i) {
 		MadsSequenceEntry rec;
@@ -565,8 +788,7 @@
 	MadsSequenceEntry &timerEntry = _entries[timerIndex];
 	SpriteAsset &sprite = _owner._spriteSlots.getSprite(timerEntry.spriteListIndex);
 
-	// TODO: Figure out logic for spriteId value based on SPRITE_SLOT.field_0
-	spriteSlot.spriteId = (0 /*field 0*/ == 1) ? -4 : 1;
+	spriteSlot.spriteType = sprite.getAssetType() == 1 ? BACKGROUND_SPRITE : FOREGROUND_SPRITE;
 	spriteSlot.timerIndex = timerIndex;
 	spriteSlot.spriteListIndex = timerEntry.spriteListIndex;
 	spriteSlot.frameNumber = ((timerEntry.field_2 == 1) ? 0x8000 : 0) | timerEntry.frameIndex;
@@ -727,10 +949,44 @@
 	}
 }
 
+void MadsSequenceList::setAnimRange(int timerIndex, int startVal, int endVal) {
+	MadsSequenceEntry &seqEntry = _entries[timerIndex];
+	SpriteAsset &spriteSet = _owner._spriteSlots.getSprite(seqEntry.spriteListIndex);
+	int numSprites = spriteSet.getCount();
+	int tempStart = startVal, tempEnd = endVal;
+
+	switch (startVal) {
+	case -2:
+		tempStart = numSprites;
+		break;
+	case -1:
+		tempStart = 1;
+		break;
+	}
+	
+	switch (endVal) {
+	case -2:
+	case 0:
+		tempEnd = numSprites;
+		break;
+	case -1:
+		tempEnd = 1;
+		break;
+	default:
+		tempEnd = numSprites;
+		break;
+	}
+
+	seqEntry.frameStart = tempStart;
+	seqEntry.numSprites = tempEnd;
+
+	seqEntry.frameIndex = (seqEntry.frameInc < 0) ? tempStart : tempEnd;
+}
+
 //--------------------------------------------------------------------------
 
 MadsView::MadsView(View *view): _view(view), _dynamicHotspots(*this), _sequenceList(*this),
-		_kernelMessages(*this) {
+		_kernelMessages(*this), _spriteSlots(*this), _dirtyAreas(*this), _textDisplay(*this) {
 	_textSpacing = -1;
 	_ticksAmount = 3;
 	_newTimeout = 0;
@@ -738,12 +994,32 @@
 	_abortTimers2 = 0;
 	_abortTimersMode = ABORTMODE_0;
 	_abortTimersMode2 = ABORTMODE_0;
+	
+	_depthSurface = NULL;
+	_bgSurface = NULL;
 }
 
 void MadsView::refresh() {
 	// Draw any sprites
-	_spriteSlots.draw(_view);
+	_spriteSlots.drawBackground();
 
+	// Process dirty areas
+	_textDisplay.setDirtyAreas();
+
+	// Merge any identified dirty areas
+	_dirtyAreas.merge(1, DIRTY_AREAS_SIZE);
+	
+	// Copy dirty areas to the main display surface 
+	_dirtyAreas.copy(_view, _bgSurface);
+
+	// Handle dirty areas for foreground objects
+	_spriteSlots.setDirtyAreas();
+	_textDisplay.setDirtyAreas2();
+	_dirtyAreas.merge(1, DIRTY_AREAS_SIZE);
+
+	// Draw foreground sprites
+	_spriteSlots.drawForeground(_view);
+
 	// Draw text elements onto the view
 	_textDisplay.draw(_view);
 

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-05-23 05:51:32 UTC (rev 49149)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-05-23 07:20:40 UTC (rev 49150)
@@ -34,6 +34,7 @@
 
 namespace M4 {
 
+#define MADS_SURFACE_WIDTH 320
 #define MADS_SURFACE_HEIGHT 156
 #define MADS_SCREEN_HEIGHT 200
 #define MADS_Y_OFFSET ((MADS_SCREEN_HEIGHT - MADS_SURFACE_HEIGHT) / 2)
@@ -44,7 +45,7 @@
 
 class MadsSpriteSlot {
 public:
-	int spriteId;
+	int spriteType;
 	int timerIndex;
 	int spriteListIndex;
 	int frameNumber;
@@ -58,16 +59,21 @@
 
 #define SPRITE_SLOTS_SIZE 50
 
+enum SpriteIdSpecial {
+	BACKGROUND_SPRITE = -4, FULL_SCREEN_REFRESH = -2, FOREGROUND_SPRITE = 1
+};
+
 typedef Common::Array<Common::SharedPtr<SpriteAsset> > SpriteList;
 
 class MadsSpriteSlots {
 private:
+	MadsView &_owner;
 	Common::Array<MadsSpriteSlot> _entries;
 	SpriteList _sprites;
 public:
 	int startIndex;
 
-	MadsSpriteSlots();
+	MadsSpriteSlots(MadsView &owner);
 
 	MadsSpriteSlot &operator[](int idx) {
 		assert(idx < SPRITE_SLOTS_SIZE);
@@ -80,13 +86,12 @@
 
 	int getIndex();
 	int addSprites(const char *resName);
-	void clear() {
-		startIndex = 0;
-		_sprites.clear();
-	}
+	void clear();
 	void deleteTimer(int timerIndex);
 
-	void draw(View *view);
+	void drawBackground();
+	void drawForeground(View *view);
+	void setDirtyAreas();
 	void cleanUp();
 };
 
@@ -108,9 +113,10 @@
 
 class MadsTextDisplay {
 private:
+	MadsView &_owner;
 	Common::Array<MadsTextDisplayEntry> _entries;
 public:
-	MadsTextDisplay();
+	MadsTextDisplay(MadsView &owner);
 
 	MadsTextDisplayEntry &operator[](int idx) {
 		assert(idx < TEXT_DISPLAY_SIZE);
@@ -125,6 +131,8 @@
 	int add(int xp, int yp, uint fontColour, int charSpacing, const char *msg, Font *font);
 	void clear();
 	void draw(View *view);
+	void setDirtyAreas();
+	void setDirtyAreas2();
 	void cleanUp();
 };
 
@@ -204,7 +212,7 @@
 class DynamicHotspot {
 public:
 	bool active;
-	int timerIndex;
+	int seqIndex;
 	Common::Rect bounds;
 	Common::Point pos;
 	int facing;
@@ -229,13 +237,47 @@
 	MadsDynamicHotspots(MadsView &owner);
 
 	DynamicHotspot &operator[](uint idx) { return _entries[idx]; }
-	int add(int descId, int field14, int timerIndex, const Common::Rect &bounds);
+	int add(int descId, int field14, int seqIndex, const Common::Rect &bounds);
 	int setPosition(int index, int xp, int yp, int facing);
 	int set17(int index, int v);
 	void remove(int index);
 	void reset();
 };
 
+class MadsDirtyArea {
+public:
+	Common::Rect bounds;
+	Common::Rect bounds2;
+	bool textActive;
+	bool active;
+
+	MadsDirtyArea() { active = false; }
+	void setArea(int width, int height, int maxWidth, int maxHeight);
+};
+
+#define DIRTY_AREAS_SIZE 90
+#define DIRTY_AREAS_TEXT_DISPLAY_IDX 50
+
+class MadsDirtyAreas {
+private:
+	MadsView &_owner;
+	Common::Array<MadsDirtyArea> _entries;
+public:
+	MadsDirtyAreas(MadsView &owner);
+
+	MadsDirtyArea &operator[](uint idx) {
+		assert(idx < _entries.size());
+		return _entries[idx];
+	}
+
+	void setSpriteSlot(int dirtyIdx, const MadsSpriteSlot &spriteSlot);
+	void setTextDisplay(int dirtyIdx, const MadsTextDisplayEntry &textDisplay);
+	void merge(int startIndex, int count);
+	bool intersects(int idx1, int idx2);
+	void mergeAreas(int idx1, int idx2);
+	void copy(M4Surface *dest, M4Surface *src);
+};
+
 enum SpriteAnimType {ANIMTYPE_CYCLED = 1, ANIMTYPE_REVERSIBLE = 2};
 
 enum SequenceSubEntryMode {SM_0 = 0, SM_1 = 1, SM_FRAME_INDEX = 2};
@@ -303,6 +345,7 @@
 	bool loadSprites(int timerIndex);
 	void tick();
 	void delay(uint32 v1, uint32 v2);
+	void setAnimRange(int timerIndex, int startVal, int endVal);
 };
 
 class MadsView {
@@ -315,6 +358,7 @@
 	ScreenObjects _screenObjects;
 	MadsDynamicHotspots _dynamicHotspots;
 	MadsSequenceList _sequenceList;
+	MadsDirtyAreas _dirtyAreas;
 
 	int _textSpacing;
 	int _ticksAmount;
@@ -323,6 +367,10 @@
 	int8 _abortTimers2;
 	AbortTimerMode _abortTimersMode;
 	AbortTimerMode _abortTimersMode2;
+	Common::Point _posAdjust;
+
+	M4Surface *_depthSurface;
+	M4Surface *_bgSurface;
 public:
 	MadsView(View *view);
 

Modified: scummvm/trunk/engines/m4/sprite.h
===================================================================
--- scummvm/trunk/engines/m4/sprite.h	2010-05-23 05:51:32 UTC (rev 49149)
+++ scummvm/trunk/engines/m4/sprite.h	2010-05-23 07:20:40 UTC (rev 49150)
@@ -115,18 +115,6 @@
 	void loadDeltaRle(Common::SeekableReadStream* rleData, int destX, int destY);
 	void loadMadsSprite(Common::SeekableReadStream* source);
 
-	void draw1(M4Surface *destSurface, int scale, int depth, int xp, int yp) {
-		// TODO: Properly implement drawing
-		copyTo(destSurface, xp, yp, 0);
-	}
-	void draw2(M4Surface *destSurface, int depth, int xp, int yp) {
-		// TODO: Properly implement drawing
-		copyTo(destSurface, xp, yp, 0);
-	}
-	void draw3(M4Surface *destSurface, int xp, int yp) {
-		// TODO: Properly implement drawing
-		copyTo(destSurface, xp, yp, 0);
-	}
 	byte getTransparentColor() const;
 protected:
 };


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

Revision: 49180
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49180&view=rev
Author:   dreammaster
Date:     2010-05-24 12:12:27 +0000 (Mon, 24 May 2010)

Log Message:
-----------
Implemented the bulk of the logic for displaying timed on-screen messages

Modified Paths:
--------------
    scummvm/trunk/engines/m4/mads_logic.cpp
    scummvm/trunk/engines/m4/mads_logic.h
    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_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-24 11:41:45 UTC (rev 49179)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-24 12:12:27 UTC (rev 49180)
@@ -245,4 +245,15 @@
 
 }
 
+void MadsSceneLogic::sceneStep() {
+	// FIXME: Temporary code to display a message on-screen
+	static bool tempBool = false;
+	if (!tempBool) {
+		tempBool = true;
+
+		_madsVm->scene()->_kernelMessages.add(Common::Point(63, 100), 0x1110, 0, 0, 240, 
+			_madsVm->globals()->getQuote(49));
+	}
 }
+
+}

Modified: scummvm/trunk/engines/m4/mads_logic.h
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.h	2010-05-24 11:41:45 UTC (rev 49179)
+++ scummvm/trunk/engines/m4/mads_logic.h	2010-05-24 12:12:27 UTC (rev 49180)
@@ -54,6 +54,7 @@
 	void setupScene();
 	void enterScene();
 	void doAction();
+	void sceneStep();
 };
 
 }

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-05-24 11:41:45 UTC (rev 49179)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-05-24 12:12:27 UTC (rev 49180)
@@ -302,7 +302,9 @@
 }
 
 void MadsScene::updateState() {
+	_sceneLogic.sceneStep();
 	_sequenceList.tick();
+	_kernelMessages.update();
 }
 
 int MadsScene::loadSceneSpriteSet(const char *setName) {
@@ -653,56 +655,4 @@
 
 /*--------------------------------------------------------------------------*/
 
-/**
- * Adds a new entry to the timed on-screen text display list
- */
-/*
-void MadsScreenText::draw(M4Surface *surface) {
-}
-
-void MadsScreenText::timedDisplay() {
-	for (int idx = 0; !_abortTimedText && (idx < OLD_TEXT_DISPLAY_SIZE); ++idx) {
-		if (((_timedText[idx].flags & TEXTFLAG_ACTIVE) != 0) && 
-			(_timedText[idx].frameTimer <= g_system->getMillis()))
-			// Add the specified entry
-			addTimedText(&_timedText[idx]);
-	}
-}
-
-void MadsScreenText::addTimedText(TimedText *entry) {
-	if ((entry->flags & TEXTFLAG_40) != 0) {
-		this->setActive2(entry->textDisplayIndex);
-		entry->flags &= 0x7F;
-		return;
-	}
-
-	if ((entry->flags & TEXTFLAG_8) == 0) 
-		// FIXME: Adjust timeouts for ScumVM's milli counter
-		entry->timeout -= 3;
-
-	if ((entry->flags & TEXTFLAG_4) != 0) {
-		Text4A &rec = _text4A[entry->unk4AIndex];
-		if ((rec.field25 != 0) || (rec.active == 0))
-			entry->timeout = 0;
-	}
-
-	if ((entry->timeout == 0) && !_abortTimedText) {
-		entry->flags |= TEXTFLAG_40;
-
-		if (entry->field_1C) {
-			_abortTimedText = entry->field_1C;
-			//word_84208 = entry->field_1D;
-			
-			if (entry->field_1D != 1) {
-				// Restore the action list
-				for (int i = 0; i < 3; ++i)
-					_madsVm->scene()->actionNouns[i] = entry->actionNouns[i]; 
-			}
-		}
-	}
-
-	// TODO: code from 'loc_244ec' onwards
-}
-*/
-
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-05-24 11:41:45 UTC (rev 49179)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-05-24 12:12:27 UTC (rev 49180)
@@ -324,12 +324,13 @@
 
 MadsKernelMessageList::MadsKernelMessageList(MadsView &owner): _owner(owner) {
 	for (int i = 0; i < TIMED_TEXT_SIZE; ++i) {
-		MadsKernelMessageListEntry rec;
+		MadsKernelMessageEntry rec;
 		_entries.push_back(rec);
 	}
 
 	_owner._textSpacing = -1;
 	_talkFont = _vm->_font->getFont(FONT_CONVERSATION_MADS);
+	word_8469E = 0;
 }
 
 void MadsKernelMessageList::clear() {
@@ -352,8 +353,8 @@
 		error("MadsKernelList overflow");
 	}
 
-	MadsKernelMessageListEntry &rec = _entries[idx];
-	rec.msg = msg;
+	MadsKernelMessageEntry &rec = _entries[idx];
+	strcpy(rec.msg, msg);
 	rec.flags = flags | KMSG_ACTIVE;
 	rec.colour1 = fontColour & 0xff;
 	rec.colour2 = fontColour >> 8;
@@ -378,13 +379,13 @@
 	return add(Common::Point(0, 0), 0x1110, KMSG_2 | KMSG_20, v2, timeout, quoteStr);
 }
 
-void MadsKernelMessageList::unk1(int msgIndex, int v1, int v2) {
+void MadsKernelMessageList::unk1(int msgIndex, int numTicks, int v2) {
 	if (msgIndex < 0)
 		return;
 
 	_entries[msgIndex].flags |= (v2 == 0) ? KMSG_8 : (KMSG_8 | KMSG_1);
 	_entries[msgIndex].msgOffset = 0;
-	_entries[msgIndex].field_E = v1;
+	_entries[msgIndex].numTicks = numTicks;
 	_entries[msgIndex].frameTimer2 = _madsVm->_currentTimer;
 
 	const char *msgP = _entries[msgIndex].msg;
@@ -405,7 +406,7 @@
 }
 
 void MadsKernelMessageList::remove(int msgIndex) {
-	MadsKernelMessageListEntry &rec = _entries[msgIndex];
+	MadsKernelMessageEntry &rec = _entries[msgIndex];
 
 	if (rec.flags & KMSG_ACTIVE) {
 		if (rec.flags & KMSG_8) {
@@ -427,6 +428,135 @@
 	// sub_20454
 }
 
+void MadsKernelMessageList::update() {
+	uint32 currentTimer = _madsVm->_currentTimer;
+
+	for (uint i = 0; i < _entries.size(); ++i) {
+		if (((_entries[i].flags & KMSG_ACTIVE) != 0) && (currentTimer >= _entries[i].frameTimer))
+			processText(i);
+	}
+}
+
+void MadsKernelMessageList::processText(int msgIndex) {
+	MadsKernelMessageEntry &msg = _entries[msgIndex];
+	uint32 currentTimer = _madsVm->_currentTimer;
+	bool flag = false;
+
+	if ((msg.flags & KMSG_40) != 0) {
+		_owner._textDisplay.expire(msg.textDisplayIndex);
+		msg.flags &= !KMSG_ACTIVE;
+		return;
+	}
+
+	if ((msg.flags & KMSG_8) == 0) {
+		msg.timeout -= 3;
+	}
+
+	if (msg.flags & KMSG_4) {
+		MadsSequenceEntry &seqEntry = _owner._sequenceList[msg.sequenceIndex];
+		if (seqEntry.doneFlag || !seqEntry.active)
+			msg.timeout = 0;
+	}
+
+	if ((msg.timeout <= 0) && (_owner._abortTimers == 0)) {
+		msg.flags |= KMSG_40;
+		if (msg.field_1C != 0) {
+			_owner._abortTimers = msg.field_1C;
+			_owner._abortTimersMode = msg.abortMode;
+
+			if (_owner._abortTimersMode != ABORTMODE_1) {
+				for (int i = 0; i < 3; ++i)
+					_madsVm->scene()->actionNouns[i] = msg.actionNouns[i];
+			}
+		}
+	}
+
+	msg.frameTimer = currentTimer + 3;
+	int x1 = 0, y1 = 0;
+
+	if (msg.flags & KMSG_4) {
+		MadsSequenceEntry &seqEntry = _owner._sequenceList[msg.sequenceIndex];
+		if (seqEntry.field_12) {
+			SpriteAsset &spriteSet = _owner._spriteSlots.getSprite(seqEntry.spriteListIndex);
+			M4Sprite *frame = spriteSet.getFrame(seqEntry.frameIndex - 1);
+			x1 = frame->bounds().left;
+			y1 = frame->bounds().top;
+		} else {
+			x1 = seqEntry.msgPos.x;
+			y1 = seqEntry.msgPos.y;
+		}
+	}
+	
+	if (msg.flags & KMSG_2) {
+		if (word_8469E != 0) {
+			// TODO: Figure out various flags
+		} else {
+			x1 = 160;
+			y1 = 78;
+		}
+	}
+
+	x1 += msg.position.x;
+	y1 += msg.position.y;
+
+	if ((msg.flags & KMSG_8) && (msg.frameTimer >= currentTimer)) {
+		msg.msg[msg.msgOffset] = msg.asciiChar;
+		char *msgP = &msg.msg[++msg.msgOffset];
+		*msgP = msg.asciiChar2;
+		
+		msg.asciiChar = *msgP;
+		msg.asciiChar2 = *(msgP + 1);
+
+		if (!msg.asciiChar) {
+			*msgP = '\0';
+			msg.flags &= ~KMSG_8;
+		} else if (msg.flags & KMSG_1) {
+			*msgP = '"';
+			*(msgP + 1) = '\0';
+		}
+
+		msg.frameTimer = msg.frameTimer2 = currentTimer + msg.numTicks;
+		flag = true;
+	}
+
+	int strWidth = _talkFont->getWidth(msg.msg, _owner._textSpacing); 
+
+	if (msg.flags & KMSG_30) {
+		x1 -= (msg.flags & KMSG_20) ? strWidth / 2 : strWidth;
+	}
+
+	// Make sure text appears entirely on-screen
+	int x2 = x1 + strWidth;
+	if (x2 > MADS_SURFACE_WIDTH)
+		x1 -= x2 - MADS_SURFACE_WIDTH;
+	if (x1 > (MADS_SURFACE_WIDTH - 1))
+		x1 = MADS_SURFACE_WIDTH - 1;
+	if (x1 < 0)
+		x1 = 0;
+
+	if (y1 > (MADS_SURFACE_HEIGHT - 1))
+		y1 = MADS_SURFACE_HEIGHT - 1;
+	if (y1 < 0)
+		y1 = 0;
+
+	if (msg.textDisplayIndex >= 0) {
+		MadsTextDisplayEntry textEntry = _owner._textDisplay[msg.textDisplayIndex];
+
+		if (flag || (textEntry.bounds.left != x1) || (textEntry.bounds.top != y1)) {
+			// Mark the associated text entry as deleted, so it can be re-created
+			_owner._textDisplay.expire(msg.textDisplayIndex);
+			msg.textDisplayIndex = -1;
+		}
+	}
+
+	if (msg.textDisplayIndex < 0) {
+		// Need to create a new text display entry for this message
+		int idx = _owner._textDisplay.add(x1, y1, msg.colour1 | (msg.colour2 << 8), _owner._textSpacing, msg.msg, _talkFont);
+		if (idx >= 0)
+			msg.textDisplayIndex = idx;
+	}
+}
+
 //--------------------------------------------------------------------------
 
 /**
@@ -725,7 +855,7 @@
 }
 
 int MadsSequenceList::add(int spriteListIndex, int v0, int frameIndex, int triggerCountdown, int delayTicks, int extraTicks, int numTicks, 
-		int height, int width, char field_12, char scale, uint8 depth, int frameInc, SpriteAnimType animType, int numSprites, 
+		int msgX, int msgY, char field_12, char scale, uint8 depth, int frameInc, SpriteAnimType animType, int numSprites, 
 		int frameStart) {
 
 	// Find a free slot
@@ -754,8 +884,8 @@
 	_entries[timerIndex].depth = depth;
 	_entries[timerIndex].scale = scale;
 	_entries[timerIndex].field_12 = field_12;
-	_entries[timerIndex].width = width;
-	_entries[timerIndex].height = height;
+	_entries[timerIndex].msgPos.x = msgX;
+	_entries[timerIndex].msgPos.y = msgY;
 	_entries[timerIndex].numTicks = numTicks;
 	_entries[timerIndex].extraTicks = extraTicks;
 
@@ -796,8 +926,8 @@
 	spriteSlot.scale = timerEntry.scale;
 	
 	if (timerEntry.field_12 == 0) {
-		spriteSlot.xp = timerEntry.width;
-		spriteSlot.yp = timerEntry.height;
+		spriteSlot.xp = timerEntry.msgPos.x;
+		spriteSlot.yp = timerEntry.msgPos.y;
 	} else {
 		spriteSlot.xp = sprite.getFrame(timerEntry.frameIndex - 1)->x;
 		spriteSlot.yp = sprite.getFrame(timerEntry.frameIndex - 1)->y;

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-05-24 11:41:45 UTC (rev 49179)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-05-24 12:12:27 UTC (rev 49180)
@@ -139,9 +139,10 @@
 #define TIMED_TEXT_SIZE 10
 #define TEXT_4A_SIZE 30
 
-enum KernelMessageFlags {KMSG_1 = 1, KMSG_2 = 2, KMSG_4 = 4, KMSG_8 = 8, KMSG_20 = 0x20, KMSG_40 = 0x40, KMSG_ACTIVE = 0x80};
+enum KernelMessageFlags {KMSG_1 = 1, KMSG_2 = 2, KMSG_4 = 4, KMSG_8 = 8, KMSG_20 = 0x20, KMSG_30 = 0x30, 
+	KMSG_40 = 0x40, KMSG_ACTIVE = 0x80};
 
-class MadsKernelMessageListEntry {
+class MadsKernelMessageEntry {
 public:
 	uint8 flags;
 	int sequenceIndex;
@@ -152,22 +153,24 @@
 	Common::Point position;
 	int textDisplayIndex;
 	int msgOffset;
-	int field_E;
+	int numTicks;
 	uint32 frameTimer2;
 	uint32 frameTimer;
 	uint32 timeout;
 	bool field_1C;
 	AbortTimerMode abortMode;
 	uint16 actionNouns[3];
-	const char *msg;
+	char msg[100];
 };
 
 class MadsKernelMessageList {
 private:
 	MadsView &_owner;
-	Common::Array<MadsKernelMessageListEntry> _entries;
+	Common::Array<MadsKernelMessageEntry> _entries;
 	Font *_talkFont;
 public:
+	int word_8469E;
+public:
 	MadsKernelMessageList(MadsView &owner);
 
 	void clear();
@@ -177,6 +180,8 @@
 	void setSeqIndex(int msgIndex, int seqIndex);
 	void remove(int msgIndex);
 	void reset();
+	void update();
+	void processText(int msgIndex);
 };
 
 class ScreenObjectEntry {
@@ -311,9 +316,7 @@
 	int field_12;
 	int field_13;
 	
-	int width;
-	int height;
-	
+	Common::Point msgPos;
 	int triggerCountdown;
 	bool doneFlag;
 	MadsSequenceSubEntries entries;
@@ -338,7 +341,7 @@
 	void clear();
 	bool addSubEntry(int index, SequenceSubEntryMode mode, int frameIndex, int abortVal);
 	int add(int spriteListIndex, int v0, int v1, int triggerCountdown, int delayTicks, int extraTicks, int numTicks, 
-		int height, int width, char field_12, char scale, uint8 depth, int frameInc, SpriteAnimType animType, 
+		int msgX, int msgY, char field_12, char scale, uint8 depth, int frameInc, SpriteAnimType animType, 
 		int numSprites, int frameStart);
 	void remove(int timerIndex);
 	void setSpriteSlot(int timerIndex, MadsSpriteSlot &spriteSlot);


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

Revision: 49209
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49209&view=rev
Author:   dreammaster
Date:     2010-05-25 10:46:56 +0000 (Tue, 25 May 2010)

Log Message:
-----------
Changed the font system to allow for multiple fonts to be loaded simultaneously

Modified Paths:
--------------
    scummvm/trunk/engines/m4/converse.cpp
    scummvm/trunk/engines/m4/dialogs.cpp
    scummvm/trunk/engines/m4/font.cpp
    scummvm/trunk/engines/m4/font.h
    scummvm/trunk/engines/m4/gui.cpp
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/m4.h
    scummvm/trunk/engines/m4/mads_anim.cpp
    scummvm/trunk/engines/m4/mads_menus.cpp
    scummvm/trunk/engines/m4/mads_scene.cpp
    scummvm/trunk/engines/m4/mads_views.cpp

Modified: scummvm/trunk/engines/m4/converse.cpp
===================================================================
--- scummvm/trunk/engines/m4/converse.cpp	2010-05-25 03:46:28 UTC (rev 49208)
+++ scummvm/trunk/engines/m4/converse.cpp	2010-05-25 10:46:56 UTC (rev 49209)
@@ -96,7 +96,7 @@
 	_vm->_font->setFont(FONT_CONVERSATION);
 
 	// TODO: Conversation styles and colors
-	_vm->_font->setColors(2, 1, 3);
+	_vm->_font->current()->setColours(2, 1, 3);
 
 	_currentNodeIndex = nodeIndex;
 
@@ -124,7 +124,7 @@
 			}
 
 			// Figure out the longest string to determine where option highlighting ends
-			int tempX = _vm->_font->getWidth(node->entries[i]->text, 0) +
+			int tempX = _vm->_font->current()->getWidth(node->entries[i]->text, 0) +
 				CONV_ENTRIES_X_OFFSET + 10;
 			_xEnd = MAX(_xEnd, tempX);
 		}
@@ -163,10 +163,10 @@
 			if (i > CONV_MAX_SHOWN_ENTRIES - 1)
 				break;
 
-			_vm->_font->setColor((_highlightedIndex == i) ? CONVERSATION_ENTRY_HIGHLIGHTED :
+			_vm->_font->current()->setColour((_highlightedIndex == i) ? CONVERSATION_ENTRY_HIGHLIGHTED :
 				CONVERSATION_ENTRY_NORMAL);
 
-			_vm->_font->writeString(this, _activeItems[i]->text, CONV_ENTRIES_X_OFFSET,
+			_vm->_font->current()->writeString(this, _activeItems[i]->text, CONV_ENTRIES_X_OFFSET,
 				CONV_ENTRIES_Y_OFFSET + CONV_ENTRIES_HEIGHT * i, 0, 0);
 		}
 	}

Modified: scummvm/trunk/engines/m4/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/m4/dialogs.cpp	2010-05-25 03:46:28 UTC (rev 49208)
+++ scummvm/trunk/engines/m4/dialogs.cpp	2010-05-25 10:46:56 UTC (rev 49209)
@@ -127,7 +127,7 @@
 		strcat(line, wordStr);
 
 		lineLen = strlen(line);
-		lineWidth = _vm->_font->getWidth(line, DIALOG_SPACING);
+		lineWidth = _vm->_font->current()->getWidth(line, DIALOG_SPACING);
 
 		if (((_lineX + lineLen) > _widthChars) || ((_widthX + lineWidth) > _dialogWidth)) {
 			incLine();
@@ -146,7 +146,7 @@
  */
 void Dialog::appendText(const char *line) {
 	_lineX += strlen(line);
-	_widthX += _vm->_font->getWidth(line, DIALOG_SPACING);
+	_widthX += _vm->_font->current()->getWidth(line, DIALOG_SPACING);
 
 	strcat(_lines[_lines.size() - 1].data, line);
 }
@@ -158,7 +158,7 @@
 	if ((_widthX > 0) || (_lineX > 0))
 		incLine();
 
-	int lineWidth = _vm->_font->getWidth(line, DIALOG_SPACING);
+	int lineWidth = _vm->_font->current()->getWidth(line, DIALOG_SPACING);
 	int lineLen = strlen(line);
 
 	if ((lineWidth > _dialogWidth) || (lineLen >= _widthChars))
@@ -383,7 +383,7 @@
 				if (id > 0) {
 					// Suffix provided - specifies the dialog width in number of chars
 					_widthChars = id * 2;
-					_dialogWidth = id * (_vm->_font->getMaxWidth() + DIALOG_SPACING) + 10;
+					_dialogWidth = id * (_vm->_font->current()->getMaxWidth() + DIALOG_SPACING) + 10;
 				}
 
 			} else if (matchCommand(cmdText, "UNDER")) {
@@ -416,7 +416,7 @@
 Dialog::Dialog(MadsM4Engine *vm, int widthChars): View(vm, Common::Rect(0, 0, 0, 0)) {
 	_vm->_font->setFont(FONT_INTERFACE_MADS);
 	_widthChars = widthChars * 2;
-	_dialogWidth = widthChars * (_vm->_font->getMaxWidth() + DIALOG_SPACING) + 10;
+	_dialogWidth = widthChars * (_vm->_font->current()->getMaxWidth() + DIALOG_SPACING) + 10;
 	_screenType = LAYER_DIALOG;
 	_lineX = 0;
 	_widthX = 0;
@@ -439,7 +439,7 @@
 
 	// Calculate bounds
 	int dlgWidth = _dialogWidth;
-	int dlgHeight = _lines.size() * (_vm->_font->getHeight() + 1) + 10;
+	int dlgHeight = _lines.size() * (_vm->_font->current()->getHeight() + 1) + 10;
 	int dialogX = (_vm->_screen->width() - dlgWidth) / 2;
 	int dialogY = (_vm->_screen->height() - dlgHeight) / 2;
 
@@ -480,26 +480,26 @@
 	}
 
 	// Handle drawing the text contents
-	_vm->_font->setColours(7, 7, 7);
+	_vm->_font->current()->setColours(7, 7, 7);
 	setColour(7);
 
-	for (uint lineCtr = 0, yp = 5; lineCtr < _lines.size(); ++lineCtr, yp += _vm->_font->getHeight() + 1) {
+	for (uint lineCtr = 0, yp = 5; lineCtr < _lines.size(); ++lineCtr, yp += _vm->_font->current()->getHeight() + 1) {
 
 		if (_lines[lineCtr].barLine) {
 			// Bar separation line
-			hLine(5, width() - 6, ((_vm->_font->getHeight() + 1) >> 1) + yp);
+			hLine(5, width() - 6, ((_vm->_font->current()->getHeight() + 1) >> 1) + yp);
 		} else {
 			// Standard line
 			Common::Point pt(_lines[lineCtr].xp + 5, yp);
 			if (_lines[lineCtr].xp & 0x40)
 				++pt.y;
 
-			_vm->_font->writeString(this, _lines[lineCtr].data, pt.x, pt.y, 0, DIALOG_SPACING);
+			_vm->_font->current()->writeString(this, _lines[lineCtr].data, pt.x, pt.y, 0, DIALOG_SPACING);
 
 			if (_lines[lineCtr].underline)
 				// Underline needed
-				hLine(pt.x, pt.x + _vm->_font->getWidth(_lines[lineCtr].data, DIALOG_SPACING),
-					pt.y + _vm->_font->getHeight());
+				hLine(pt.x, pt.x + _vm->_font->current()->getWidth(_lines[lineCtr].data, DIALOG_SPACING),
+					pt.y + _vm->_font->current()->getHeight());
 		}
 	}
 
@@ -528,7 +528,7 @@
 		dlg->incLine();
 		dlg->writeChars(*descEntries);
 
-		int lineWidth = vm->_font->getWidth(*descEntries, DIALOG_SPACING);
+		int lineWidth = vm->_font->current()->getWidth(*descEntries, DIALOG_SPACING);
 		dlg->_lines[dlg->_lines.size() - 1].xp = (dlg->_dialogWidth - 10 - lineWidth) / 2;
 		++descEntries;
 	}

Modified: scummvm/trunk/engines/m4/font.cpp
===================================================================
--- scummvm/trunk/engines/m4/font.cpp	2010-05-25 03:46:28 UTC (rev 49208)
+++ scummvm/trunk/engines/m4/font.cpp	2010-05-25 10:46:56 UTC (rev 49209)
@@ -29,28 +29,46 @@
 
 namespace M4 {
 
-Font::Font(MadsM4Engine *vm) : _vm(vm) {
+FontManager::~FontManager() {
+	for (uint i = 0; i < _entries.size(); ++i)
+		delete _entries[i];
+	_entries.clear();
+}
+
+Font *FontManager::getFont(const Common::String &filename) {
+	// Check if the font is already loaded
+	for (uint i = 0; i < _entries.size(); ++i)
+	{
+		if (_entries[i]->_filename.equals(filename))
+			return _entries[i];
+	}
+
+	Font *f = new Font(_vm, filename);
+	_entries.push_back(f);
+	return f;
+}
+
+void FontManager::setFont(const Common::String &filename) {
+	_currentFont = getFont(filename);
+}
+
+//--------------------------------------------------------------------------
+
+Font::Font(MadsM4Engine *vm, const Common::String &filename) : _vm(vm), _filename(filename) {
 	_sysFont = true;
-	_filename = NULL;
+
 	//TODO: System font
 	_fontColors[0] = _vm->_palette->BLACK;
 	_fontColors[1] = _vm->_palette->WHITE;
 	_fontColors[2] = _vm->_palette->BLACK;
 	_fontColors[3] = _vm->_palette->DARK_GRAY;
-}
 
-void Font::setFont(const char *filename) {
-	if ((_filename != NULL) && (strcmp(filename, _filename) == 0))
-		// Already using specified font, so don't bother reloading
-		return;
-
 	_sysFont = false;
-	_filename = filename;
 
 	if (_vm->isM4())
-		setFontM4(filename);
+		setFontM4(filename.c_str());
 	else
-		setFontMads(filename);
+		setFontMads(filename.c_str());
 }
 
 void Font::setFontM4(const char *filename) {
@@ -134,20 +152,21 @@
 	}
 }
 
-void Font::setColor(uint8 color) {
+void Font::setColour(uint8 colour) {
 	if (_sysFont)
-		_fontColors[1] = color;
+		_fontColors[1] = colour;
 	else
-		_fontColors[3] = color;
+		_fontColors[3] = colour;
 }
 
-void Font::setColors(uint8 alt1, uint8 alt2, uint8 foreground) {
+void Font::setColours(uint8 col1, uint8 col2, uint8 col3) {
 	if (_sysFont)
-		_fontColors[1] = foreground;
+		_fontColors[1] = col3;
 	else {
-		_fontColors[1] = alt1;
-		_fontColors[2] = alt2;
-		_fontColors[3] = foreground;
+		_fontColors[0] = 0xFF;
+		_fontColors[1] = col1;
+		_fontColors[2] = col2;
+		_fontColors[3] = col3;
 	}
 }
 

Modified: scummvm/trunk/engines/m4/font.h
===================================================================
--- scummvm/trunk/engines/m4/font.h	2010-05-25 03:46:28 UTC (rev 49208)
+++ scummvm/trunk/engines/m4/font.h	2010-05-25 10:46:56 UTC (rev 49209)
@@ -59,19 +59,11 @@
 
 class Font {
 public:
-	Font(MadsM4Engine *vm);
+	Font(MadsM4Engine *vm, const Common::String &filename);
 	~Font();
 
-	Font *getFont(const char *filename) {
-		// TODO: Proper separation of font instances
-		setFont(filename);
-		return this;
-	}
-	void setFont(const char *filename);
-	void setColor(uint8 color);
-	void setColors(uint8 alt1, uint8 alt2, uint8 foreground);
-	void setColour(uint8 colour) { setColor(colour); }
-	void setColours(uint8 alt1, uint8 alt2, uint8 foreground) { setColors(alt1, alt2, foreground); }
+	void setColour(uint8 colour);
+	void setColours(uint8 col1, uint8 col2, uint8 col3);
 
 	int32 getWidth(const char *text, int spaceWidth = -1);
 	int32 getHeight() const { return _maxHeight; }
@@ -80,7 +72,8 @@
 	int32 writeString(M4Surface *surface, const char *text, int x, int y, int width = 0, int spaceWidth = -1) {
 		return write(surface, text, x, y, width, spaceWidth, _fontColors);
 	}
-
+public:
+	const Common::String _filename;
 private:
 	void setFontM4(const char *filename);
 	void setFontMads(const char *filename);
@@ -91,10 +84,39 @@
 	uint16 *_charOffs;
 	uint8 *_charData;
 	bool _sysFont;
-	const char *_filename;
 	uint8 _fontColors[4];
 };
 
+class FontEntry {
+public:
+	Font *_font;
+
+	FontEntry() {
+		_font = NULL;
+	}
+	~FontEntry() {
+		delete _font;
+	}
+};
+
+class FontManager {
+private:
+	MadsM4Engine *_vm;
+	Common::Array<Font *> _entries;
+	Font *_currentFont;
+public:
+	FontManager(MadsM4Engine *vm): _vm(vm) { _currentFont = NULL; }
+	~FontManager();
+
+	Font *getFont(const Common::String &filename);
+	void setFont(const Common::String &filename);
+
+	Font *current() { 
+		assert(_currentFont);
+		return _currentFont;
+	}
+};
+
 } // End of namespace M4
 
 #endif

Modified: scummvm/trunk/engines/m4/gui.cpp
===================================================================
--- scummvm/trunk/engines/m4/gui.cpp	2010-05-25 03:46:28 UTC (rev 49208)
+++ scummvm/trunk/engines/m4/gui.cpp	2010-05-25 10:46:56 UTC (rev 49209)
@@ -290,26 +290,26 @@
 	case OBJTYPE_SL_TEXT:
 		switch (_objectState) {
 		case OS_MOUSEOVER:
-			_vm->_font->setColors(TEXT_COLOR_MOUSEOVER_SHADOW, TEXT_COLOR_MOUSEOVER_FOREGROUND,
+			_vm->_font->current()->setColours(TEXT_COLOR_MOUSEOVER_SHADOW, TEXT_COLOR_MOUSEOVER_FOREGROUND,
 				TEXT_COLOR_MOUSEOVER_HILIGHT);
 			sprite = sprites[SL_LINE_MOUSEOVER];
 			break;
 
 		case OS_PRESSED:
-			_vm->_font->setColors(TEXT_COLOR_PRESSED_SHADOW, TEXT_COLOR_PRESSED_FOREGROUND,
+			_vm->_font->current()->setColours(TEXT_COLOR_PRESSED_SHADOW, TEXT_COLOR_PRESSED_FOREGROUND,
 				TEXT_COLOR_PRESSED_HILIGHT);
 			sprite = sprites[SL_LINE_PRESSED];
 			break;
 
 		case OS_GREYED:
-			_vm->_font->setColors(TEXT_COLOR_GREYED_SHADOW, TEXT_COLOR_GREYED_FOREGROUND,
+			_vm->_font->current()->setColours(TEXT_COLOR_GREYED_SHADOW, TEXT_COLOR_GREYED_FOREGROUND,
 				TEXT_COLOR_GREYED_HILIGHT);
 			sprite = sprites[SL_LINE_NORMAL];
 			break;
 
 		default:
 		case OS_NORMAL:
-			_vm->_font->setColors(TEXT_COLOR_NORMAL_SHADOW, TEXT_COLOR_NORMAL_FOREGROUND,
+			_vm->_font->current()->setColours(TEXT_COLOR_NORMAL_SHADOW, TEXT_COLOR_NORMAL_FOREGROUND,
 				TEXT_COLOR_NORMAL_HILIGHT);
 			sprite = sprites[SL_LINE_NORMAL];
 			break;
@@ -849,11 +849,11 @@
 		if (_displayValue != 0) {
 			char tempBuffer[5];
 			sprintf(tempBuffer, "%02d", _displayValue);
-			_vm->_font->writeString(_parent, tempBuffer, xp, _bounds.top + 1, 0, -1);
+			_vm->_font->current()->writeString(_parent, tempBuffer, xp, _bounds.top + 1, 0, -1);
 			xp = _bounds.left + 26;
 		}
 
-		_vm->_font->writeString(_parent, _displayText, xp, _bounds.top + 1, 0, -1);
+		_vm->_font->current()->writeString(_parent, _displayText, xp, _bounds.top + 1, 0, -1);
 	}
 }
 
@@ -955,18 +955,18 @@
 	// Draw the text
 
 	_vm->_font->setFont(FONT_MENU);
-	_vm->_font->setColors(TEXT_COLOR_NORMAL_SHADOW, TEXT_COLOR_NORMAL_FOREGROUND,
+	_vm->_font->current()->setColours(TEXT_COLOR_NORMAL_SHADOW, TEXT_COLOR_NORMAL_FOREGROUND,
 		TEXT_COLOR_NORMAL_HILIGHT);
 	int xp = _bounds.left + 4;
 
 	if (_displayValue != 0) {
 		char tempBuffer[5];
 		sprintf(tempBuffer, "%02d", _displayValue);
-		_vm->_font->writeString(_parent, tempBuffer, xp, _bounds.top + 1, 0, -1);
+		_vm->_font->current()->writeString(_parent, tempBuffer, xp, _bounds.top + 1, 0, -1);
 		xp = _bounds.left + 26;
 	}
 
-	_vm->_font->writeString(_parent, _displayText, xp, _bounds.top + 1, 0, -1);
+	_vm->_font->current()->writeString(_parent, _displayText, xp, _bounds.top + 1, 0, -1);
 
 	if (focused) {
 		// Draw in the cursor
@@ -975,7 +975,7 @@
 			// Get the width of the string up to the cursor position
 			char tempCh = *_cursor;
 			*_cursor = '\0';
-			int stringWidth = _vm->_font->getWidth(_displayText);
+			int stringWidth = _vm->_font->current()->getWidth(_displayText);
 			*_cursor = tempCh;
 
 			parent()->setColor(TEXT_COLOR_MOUSEOVER_FOREGROUND);
@@ -1015,10 +1015,10 @@
 					tempP = &tempStr[tempLen];
 					_vm->_font->setFont(FONT_MENU);
 
-					tempLen = _vm->_font->getWidth(tempStr);
+					tempLen = _vm->_font->current()->getWidth(tempStr);
 					while ((tempP != &tempStr[0]) && (tempLen > x - _bounds.left - 26)) {
 						*--tempP = '\0';
-						tempLen = _vm->_font->getWidth(tempStr);
+						tempLen = _vm->_font->current()->getWidth(tempStr);
 					}
 
 					_cursor = &_displayText[tempP - &tempStr[0]];
@@ -1098,7 +1098,7 @@
 			parent()->_deleteSaveDesc = false;
 			_vm->_font->setFont(FONT_MENU);
 
-			tempLen = _vm->_font->getWidth(_displayText);
+			tempLen = _vm->_font->current()->getWidth(_displayText);
 			if ((strlen(_displayText) < MAX_SAVEGAME_NAME - 1) &&
 				(tempLen < _pixelWidth - 12) && (param >= 32) && (param <= 127)) {
 
@@ -1140,9 +1140,9 @@
 
 void GUITextField::onRefresh() {
 	_parent->fillRect(_bounds, _vm->_palette->BLACK);
-	_vm->_font->setColors(3, 3, 3);
+	_vm->_font->current()->setColours(3, 3, 3);
 	_vm->_font->setFont(FONT_INTERFACE);
-	_vm->_font->writeString(_parent, _text.c_str(), _bounds.left, _bounds.top, 0, 1);
+	_vm->_font->current()->writeString(_parent, _text.c_str(), _bounds.left, _bounds.top, 0, 1);
 }
 
 //--------------------------------------------------------------------------

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2010-05-25 03:46:28 UTC (rev 49208)
+++ scummvm/trunk/engines/m4/m4.cpp	2010-05-25 10:46:56 UTC (rev 49209)
@@ -170,7 +170,7 @@
 	_events = new Events(this);
 	_kernel = new Kernel(this);
 	_player = new Player(this);
-	_font = new Font(this);
+	_font = new FontManager(this);
 	if (getGameType() == GType_Burger) {
 		_actor = new Actor(this);
 		_conversationView = new ConversationView(this);
@@ -554,9 +554,9 @@
 		_scene->show();
 
 		_font->setFont(FONT_MAIN_MADS);
-		_font->setColors(2, 1, 3);
-		_font->writeString(_scene->getBackgroundSurface(), "Testing the M4/MADS ScummVM engine", 5, 160, 310, 2);
-		_font->writeString(_scene->getBackgroundSurface(), "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 5, 180, 310, 2);
+		_font->current()->setColours(2, 1, 3);
+		_font->current()->writeString(_scene->getBackgroundSurface(), "Testing the M4/MADS ScummVM engine", 5, 160, 310, 2);
+		_font->current()->writeString(_scene->getBackgroundSurface(), "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 5, 180, 310, 2);
 
 		if (getGameType() == GType_DragonSphere) {
 			//_scene->showMADSV2TextBox("Test", 10, 10, NULL);

Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h	2010-05-25 03:46:28 UTC (rev 49208)
+++ scummvm/trunk/engines/m4/m4.h	2010-05-25 10:46:56 UTC (rev 49209)
@@ -189,7 +189,7 @@
 	Player *_player;
 	Mouse *_mouse;
 	Events *_events;
-	Font *_font;
+	FontManager *_font;
 	Actor *_actor;
 	Scene *_scene;
 	Dialogs *_dialogs;

Modified: scummvm/trunk/engines/m4/mads_anim.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_anim.cpp	2010-05-25 03:46:28 UTC (rev 49208)
+++ scummvm/trunk/engines/m4/mads_anim.cpp	2010-05-25 10:46:56 UTC (rev 49209)
@@ -37,7 +37,7 @@
 TextviewView::TextviewView(MadsM4Engine *vm):
 		View(vm, Common::Rect(0, 0, vm->_screen->width(), vm->_screen->height())),
 		_bgSurface(vm->_screen->width(), MADS_SURFACE_HEIGHT),
-		_textSurface(vm->_screen->width(), MADS_SURFACE_HEIGHT + vm->_font->getHeight() +
+		_textSurface(vm->_screen->width(), MADS_SURFACE_HEIGHT + vm->_font->current()->getHeight() +
 			TEXTVIEW_LINE_SPACING) {
 
 	_screenType = VIEWID_TEXTVIEW;
@@ -60,7 +60,7 @@
 	_vm->_palette->setPalette(&palData[0], 4, 3);
 	_vm->_palette->blockRange(4, 3);
 
-	_vm->_font->setColors(5, 6, 4);
+	_vm->_font->current()->setColours(5, 6, 4);
 
 	clear();
 	_bgSurface.clear();
@@ -222,7 +222,7 @@
 		}
 	} else {
 		// Handling a text row
-		if (++_lineY == (_vm->_font->getHeight() + TEXTVIEW_LINE_SPACING))
+		if (++_lineY == (_vm->_font->current()->getHeight() + TEXTVIEW_LINE_SPACING))
 			processLines();
 	}
 
@@ -404,7 +404,7 @@
 
 	if (!strcmp(_currentLine, "***")) {
 		// Special signifier for end of script
-		_scrollCount = _vm->_font->getHeight() * 13;
+		_scrollCount = _vm->_font->current()->getHeight() * 13;
 		_lineY = -1;
 		return;
 	}
@@ -416,7 +416,7 @@
 	char *centerP = strchr(_currentLine, '@');
 	if (centerP) {
 		*centerP = '\0';
-		xStart = (width() / 2) - _vm->_font->getWidth(_currentLine);
+		xStart = (width() / 2) - _vm->_font->current()->getWidth(_currentLine);
 
 		// Delete the @ character and shift back the remainder of the string
 		char *p = centerP + 1;
@@ -424,16 +424,16 @@
 		strcpy(centerP, p);
 
 	} else {
-		lineWidth = _vm->_font->getWidth(_currentLine);
+		lineWidth = _vm->_font->current()->getWidth(_currentLine);
 		xStart = (width() - lineWidth) / 2;
 	}
 
 	// Copy the text line onto the bottom of the textSurface surface, which will allow it
 	// to gradually scroll onto the screen
-	int yp = _textSurface.height() - _vm->_font->getHeight() - TEXTVIEW_LINE_SPACING;
+	int yp = _textSurface.height() - _vm->_font->current()->getHeight() - TEXTVIEW_LINE_SPACING;
 	_textSurface.fillRect(Common::Rect(0, yp, _textSurface.width(), _textSurface.height()),
 		_vm->_palette->BLACK);
-	_vm->_font->writeString(&_textSurface, _currentLine, xStart, yp);
+	_vm->_font->current()->writeString(&_textSurface, _currentLine, xStart, yp);
 }
 
 

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-05-25 03:46:28 UTC (rev 49208)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-05-25 10:46:56 UTC (rev 49209)
@@ -985,15 +985,15 @@
 
 void RexGameMenuDialog::addLines() {
 	// Add the title
-	int top = MADS_Y_OFFSET - 2 - ((((_vm->_font->getHeight() + 2) * 6) >> 1) - 78);
+	int top = MADS_Y_OFFSET - 2 - ((((_vm->_font->current()->getHeight() + 2) * 6) >> 1) - 78);
 		
-	addQuote(_vm->_font, ALIGN_CENTER, 0, top, 10);
+	addQuote(_vm->_font->current(), ALIGN_CENTER, 0, top, 10);
 
 	// Loop for adding the option lines of the dialog
 	top += 6;
 	for (int idx = 0; idx < 5; ++idx) {
-		top += _vm->_font->getHeight() + 1;
-		addQuote(_vm->_font, ALIGN_CENTER, 0, top, 11 + idx);
+		top += _vm->_font->current()->getHeight() + 1;
+		addQuote(_vm->_font->current(), ALIGN_CENTER, 0, top, 11 + idx);
 	}
 }
 
@@ -1069,42 +1069,42 @@
 
 void RexOptionsDialog::addLines() {
 	// Add the title
-	int top = MADS_Y_OFFSET - 2 - ((((_vm->_font->getHeight() + 1) * 9 + 12) >> 1) - 78);
+	int top = MADS_Y_OFFSET - 2 - ((((_vm->_font->current()->getHeight() + 1) * 9 + 12) >> 1) - 78);
 
-	addQuote(_vm->_font, ALIGN_CENTER, 0, top, 16);
+	addQuote(_vm->_font->current(), ALIGN_CENTER, 0, top, 16);
 
 	// Music state line
-	top += _vm->_font->getHeight() + 1 + 6;
-	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 17, _tempConfig.musicFlag ? 24 : 25);
+	top += _vm->_font->current()->getHeight() + 1 + 6;
+	addQuote(_vm->_font->current(), ALIGN_CHAR_CENTER, 0, top, 17, _tempConfig.musicFlag ? 24 : 25);
 
 	// Sound state line
-	top += _vm->_font->getHeight() + 1;
-	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 18, _tempConfig.soundFlag ? 26 : 27);
+	top += _vm->_font->current()->getHeight() + 1;
+	addQuote(_vm->_font->current(), ALIGN_CHAR_CENTER, 0, top, 18, _tempConfig.soundFlag ? 26 : 27);
 
 	// Interface easy state line
-	top += _vm->_font->getHeight() + 1;
-	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 19, _tempConfig.easyMouse ? 29 : 28);
+	top += _vm->_font->current()->getHeight() + 1;
+	addQuote(_vm->_font->current(), ALIGN_CHAR_CENTER, 0, top, 19, _tempConfig.easyMouse ? 29 : 28);
 
 	// Inventory sppinng state line
-	top += _vm->_font->getHeight() + 1;
-	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 20, _tempConfig.invObjectsStill ? 31 : 30);
+	top += _vm->_font->current()->getHeight() + 1;
+	addQuote(_vm->_font->current(), ALIGN_CHAR_CENTER, 0, top, 20, _tempConfig.invObjectsStill ? 31 : 30);
 
 	// Text window state line
-	top += _vm->_font->getHeight() + 1;
-	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 21, _tempConfig.textWindowStill ? 33 : 32);
+	top += _vm->_font->current()->getHeight() + 1;
+	addQuote(_vm->_font->current(), ALIGN_CHAR_CENTER, 0, top, 21, _tempConfig.textWindowStill ? 33 : 32);
 
 	// Screen fade state line
-	top += _vm->_font->getHeight() + 1;
-	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 22, _tempConfig.screenFades + 34);
+	top += _vm->_font->current()->getHeight() + 1;
+	addQuote(_vm->_font->current(), ALIGN_CHAR_CENTER, 0, top, 22, _tempConfig.screenFades + 34);
 
 	// Storyline mode line
-	top += _vm->_font->getHeight() + 1;
-	addQuote(_vm->_font, ALIGN_CHAR_CENTER, 0, top, 23, (_tempConfig.storyMode == 1) ? 37 : 38);
+	top += _vm->_font->current()->getHeight() + 1;
+	addQuote(_vm->_font->current(), ALIGN_CHAR_CENTER, 0, top, 23, (_tempConfig.storyMode == 1) ? 37 : 38);
 
 	// Add Done and Cancel button texts
-	top += _vm->_font->getHeight() + 1 + 6;
-	addQuote(_vm->_font, ALIGN_CENTER, -54, top, 1, 0);
-	addQuote(_vm->_font, ALIGN_CENTER, 54, top, 2, 0);
+	top += _vm->_font->current()->getHeight() + 1 + 6;
+	addQuote(_vm->_font->current(), ALIGN_CENTER, -54, top, 1, 0);
+	addQuote(_vm->_font->current(), ALIGN_CENTER, 54, top, 2, 0);
 }
 
 bool RexOptionsDialog::onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents) {

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-05-25 03:46:28 UTC (rev 49208)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-05-25 10:46:56 UTC (rev 49209)
@@ -289,12 +289,12 @@
 	if (sStatusText[0]) {
 		// Text colors are inverted in Dragonsphere
 		if (_vm->getGameType() == GType_DragonSphere)
-			_vm->_font->setColors(_vm->_palette->BLACK, _vm->_palette->WHITE, _vm->_palette->BLACK);
+			_vm->_font->current()->setColours(_vm->_palette->BLACK, _vm->_palette->WHITE, _vm->_palette->BLACK);
 		else
-			_vm->_font->setColors(_vm->_palette->WHITE, _vm->_palette->BLACK, _vm->_palette->BLACK);
+			_vm->_font->current()->setColours(_vm->_palette->WHITE, _vm->_palette->BLACK, _vm->_palette->BLACK);
 
 		_vm->_font->setFont(FONT_MAIN_MADS);
-		_vm->_font->writeString(this, sStatusText, (width() - _vm->_font->getWidth(sStatusText)) / 2, 142, 0);
+		_vm->_font->current()->writeString(this, sStatusText, (width() - _vm->_font->current()->getWidth(sStatusText)) / 2, 142, 0);
 	}
 
 	//***DEBUG***

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-05-25 03:46:28 UTC (rev 49208)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-05-25 10:46:56 UTC (rev 49209)
@@ -291,8 +291,7 @@
 void MadsTextDisplay::draw(View *view) {
 	for (uint idx = 0; idx < _entries.size(); ++idx) {
 		if (_entries[idx].active && (_entries[idx].expire >= 0)) {
-			_entries[idx].font->setColours(_entries[idx].colour1, 
-				(_entries[idx].colour2 == 0) ? _entries[idx].colour1 : _entries[idx].colour2, 0xff);
+			_entries[idx].font->setColours(_entries[idx].colour1, _entries[idx].colour2, 0);
 			_entries[idx].font->writeString(view, _entries[idx].msg, 
 				_entries[idx].bounds.left, _entries[idx].bounds.top, _entries[idx].bounds.width(),
 				_entries[idx].spacing);
@@ -1204,13 +1203,13 @@
 void MadsInterfaceView::setFontMode(InterfaceFontMode newMode) {
 	switch (newMode) {
 	case ITEM_NORMAL:
-		_vm->_font->setColors(4, 4, 0xff);
+		_vm->_font->current()->setColours(4, 4, 0xff);
 		break;
 	case ITEM_HIGHLIGHTED:
-		_vm->_font->setColors(5, 5, 0xff);
+		_vm->_font->current()->setColours(5, 5, 0xff);
 		break;
 	case ITEM_SELECTED:
-		_vm->_font->setColors(6, 6, 0xff);
+		_vm->_font->current()->setColours(6, 6, 0xff);
 		break;
 	}
 }
@@ -1300,7 +1299,7 @@
 
 			// Display the verb
 			const Common::Rect r(_screenObjects[actionIndex]);
-			_vm->_font->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
+			_vm->_font->current()->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
 		}
 	}
 
@@ -1335,7 +1334,7 @@
 		else setFontMode(ITEM_NORMAL);
 
 		// Write out it's description
-		_vm->_font->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
+		_vm->_font->current()->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
 	}
 
 	// Handle the display of any currently selected object
@@ -1365,7 +1364,7 @@
 
 			// Set the highlighting and display the entry
 			setFontMode((i == yIndex) ? ITEM_HIGHLIGHTED : ITEM_NORMAL);
-			_vm->_font->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
+			_vm->_font->current()->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
 		}
 	}
 }


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

Revision: 49211
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49211&view=rev
Author:   dreammaster
Date:     2010-05-25 11:54:18 +0000 (Tue, 25 May 2010)

Log Message:
-----------
Bugfix to allow timed text to display in the correct colours

Modified Paths:
--------------
    scummvm/trunk/engines/m4/mads_logic.cpp
    scummvm/trunk/engines/m4/mads_scene.cpp

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-25 11:35:16 UTC (rev 49210)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-25 11:54:18 UTC (rev 49211)
@@ -59,8 +59,8 @@
 //	if ((_sceneNumber == 105) ((_sceneNumber == 109) && (word_84800 != 0)))
 //		_madsVm->globals()->playerSpriteChanged = true;
 
-//	_vm->_palette->setEntry(16, 0x38, 0xFF, 0xFF);
-//	_vm->_palette->setEntry(17, 0x38, 0xb4, 0xb4);
+	_vm->_palette->setEntry(16, 0x38, 0xFF, 0xFF);
+	_vm->_palette->setEntry(17, 0x38, 0xb4, 0xb4);
 }
 
 void MadsSceneLogic::getAnimName() {
@@ -169,7 +169,9 @@
 
 //	sub_1e754(animName, 3);
 
-	getSceneSpriteSet();
+	if ((_sceneNumber >= 101) && (_sceneNumber <= 112))
+		getSceneSpriteSet();
+
 	getAnimName();
 }
 

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-05-25 11:35:16 UTC (rev 49210)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-05-25 11:54:18 UTC (rev 49211)
@@ -78,7 +78,7 @@
 void MadsScene::loadSceneTemporary() {
 	/* Existing code that eventually needs to be replaced with the proper MADS code */
 	// Set system palette entries
-	_vm->_palette->blockRange(0, 7);
+	_vm->_palette->blockRange(0, 18);
 	RGB8 sysColors[3] = { {0x1f<<2, 0x2d<<2, 0x31<<2, 0}, {0x24<<2, 0x37<<2, 0x3a<<2, 0},
 		{0x00<<2, 0x10<<2, 0x16<<2, 0}};
 	_vm->_palette->setPalette(&sysColors[0], 4, 3);


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

Revision: 49229
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49229&view=rev
Author:   dreammaster
Date:     2010-05-26 08:32:32 +0000 (Wed, 26 May 2010)

Log Message:
-----------
Gave proper names to each flag in the message flag set

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

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-26 08:27:24 UTC (rev 49228)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-26 08:32:32 UTC (rev 49229)
@@ -83,7 +83,7 @@
 		spriteFrame->y + (spriteFrame->height() / 2)));
 
 	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, triggerCountdown, timeoutTicks, extraTicks, numTicks, 0, 0, 
-		-1, 100, depth - 1, 1, ANIMTYPE_REVERSIBLE, 0, 0);
+		true, 100, depth - 1, 1, ANIMTYPE_REVERSIBLE, 0, 0);
 }
 
 uint16 MadsSceneLogic::startCycledSpriteSequence(uint16 srcSpriteIdx, int v0, int numTicks, int triggerCountdown, int timeoutTicks, int extraTicks) {
@@ -92,7 +92,7 @@
 		spriteFrame->y + (spriteFrame->height() / 2)));
 
 	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, triggerCountdown, timeoutTicks, extraTicks, numTicks, 0, 0, 
-		-1, 100, depth - 1, 1, ANIMTYPE_CYCLED, 0, 0);
+		true, 100, depth - 1, 1, ANIMTYPE_CYCLED, 0, 0);
 }
 
 uint16 MadsSceneLogic::startSpriteSequence3(uint16 srcSpriteIdx, int v0, int numTicks, int triggerCountdown, int timeoutTicks, int extraTicks) {
@@ -101,7 +101,7 @@
 		spriteFrame->y + (spriteFrame->height() / 2)));
 
 	return _madsVm->scene()->_sequenceList.add(srcSpriteIdx, v0, 1, triggerCountdown, timeoutTicks, extraTicks, numTicks, 0, 0, 
-		-1, 100, depth - 1, -1, ANIMTYPE_CYCLED, 0, 0);
+		true, 100, depth - 1, -1, ANIMTYPE_CYCLED, 0, 0);
 }
 
 void MadsSceneLogic::activateHotspot(int idx, bool active) {

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-05-26 08:27:24 UTC (rev 49228)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-05-26 08:32:32 UTC (rev 49229)
@@ -340,13 +340,13 @@
 	_talkFont = _vm->_font->getFont(FONT_CONVERSATION_MADS);
 }
 
-int MadsKernelMessageList::add(const Common::Point &pt, uint fontColour, uint8 flags, uint8 v2, uint32 timeout, const char *msg) {
+int MadsKernelMessageList::add(const Common::Point &pt, uint fontColour, uint8 flags, uint8 abortTimers, uint32 timeout, const char *msg) {
 	// Find a free slot
 	uint idx = 0;
 	while ((idx < _entries.size()) && ((_entries[idx].flags & KMSG_ACTIVE) != 0))
 		++idx;
 	if (idx == _entries.size()) {
-		if (v2 == 0)
+		if (abortTimers == 0)
 			return -1;
 
 		error("MadsKernelList overflow");
@@ -361,28 +361,28 @@
 	rec.textDisplayIndex = -1;
 	rec.timeout = timeout;
 	rec.frameTimer = _madsVm->_currentTimer;
-	rec.field_1C = v2;
+	rec.abortTimers = abortTimers;
 	rec.abortMode = _owner._abortTimersMode2;
 	
 	for (int i = 0; i < 3; ++i)
 		rec.actionNouns[i] = _madsVm->scene()->actionNouns[i];
 
-	if (flags & KMSG_2)
+	if (flags & KMSG_OWNER_TIMEOUT)
 		rec.frameTimer = _owner._ticksAmount + _owner._newTimeout;
 
 	return idx;
 }
 
-int MadsKernelMessageList::addQuote(int quoteId, int v2, uint32 timeout) {
+int MadsKernelMessageList::addQuote(int quoteId, int abortTimers, uint32 timeout) {
 	const char *quoteStr = _madsVm->globals()->getQuote(quoteId);
-	return add(Common::Point(0, 0), 0x1110, KMSG_2 | KMSG_20, v2, timeout, quoteStr);
+	return add(Common::Point(0, 0), 0x1110, KMSG_OWNER_TIMEOUT | KMSG_CENTER_ALIGN, abortTimers, timeout, quoteStr);
 }
 
-void MadsKernelMessageList::unk1(int msgIndex, int numTicks, int v2) {
+void MadsKernelMessageList::scrollMessage(int msgIndex, int numTicks, bool quoted) {
 	if (msgIndex < 0)
 		return;
 
-	_entries[msgIndex].flags |= (v2 == 0) ? KMSG_8 : (KMSG_8 | KMSG_1);
+	_entries[msgIndex].flags |= quoted ? (KMSG_SCROLL | KMSG_QUOTED) : KMSG_SCROLL;
 	_entries[msgIndex].msgOffset = 0;
 	_entries[msgIndex].numTicks = numTicks;
 	_entries[msgIndex].frameTimer2 = _madsVm->_currentTimer;
@@ -391,7 +391,7 @@
 	_entries[msgIndex].asciiChar = *msgP;
 	_entries[msgIndex].asciiChar2 = *(msgP + 1);
 
-	if (_entries[msgIndex].flags & KMSG_2)
+	if (_entries[msgIndex].flags & KMSG_OWNER_TIMEOUT)
 		_entries[msgIndex].frameTimer2 = _owner._ticksAmount + _owner._newTimeout;
 
 	_entries[msgIndex].frameTimer = _entries[msgIndex].frameTimer2;
@@ -399,7 +399,7 @@
 
 void MadsKernelMessageList::setSeqIndex(int msgIndex, int seqIndex) {
 	if (msgIndex >= 0) {
-		_entries[msgIndex].flags |= KMSG_4;
+		_entries[msgIndex].flags |= KMSG_SEQ_ENTRY;
 		_entries[msgIndex].sequenceIndex = seqIndex;
 	}
 }
@@ -408,9 +408,9 @@
 	MadsKernelMessageEntry &rec = _entries[msgIndex];
 
 	if (rec.flags & KMSG_ACTIVE) {
-		if (rec.flags & KMSG_8) {
-			//*(rec.msg + rec.msgOffset) = rec.asciiChar;
-			//*(rec.msg + rec.msgOffset + 1) = rec.asciiChar2;
+		if (rec.flags & KMSG_SCROLL) {
+			*(rec.msg + rec.msgOffset) = rec.asciiChar;
+			*(rec.msg + rec.msgOffset + 1) = rec.asciiChar2;
 		}
 
 		if (rec.textDisplayIndex >= 0)
@@ -441,26 +441,26 @@
 	uint32 currentTimer = _madsVm->_currentTimer;
 	bool flag = false;
 
-	if ((msg.flags & KMSG_40) != 0) {
+	if ((msg.flags & KMSG_EXPIRE) != 0) {
 		_owner._textDisplay.expire(msg.textDisplayIndex);
 		msg.flags &= !KMSG_ACTIVE;
 		return;
 	}
 
-	if ((msg.flags & KMSG_8) == 0) {
+	if ((msg.flags & KMSG_SCROLL) == 0) {
 		msg.timeout -= 3;
 	}
 
-	if (msg.flags & KMSG_4) {
+	if (msg.flags & KMSG_SEQ_ENTRY) {
 		MadsSequenceEntry &seqEntry = _owner._sequenceList[msg.sequenceIndex];
 		if (seqEntry.doneFlag || !seqEntry.active)
 			msg.timeout = 0;
 	}
 
 	if ((msg.timeout <= 0) && (_owner._abortTimers == 0)) {
-		msg.flags |= KMSG_40;
-		if (msg.field_1C != 0) {
-			_owner._abortTimers = msg.field_1C;
+		msg.flags |= KMSG_EXPIRE;
+		if (msg.abortTimers != 0) {
+			_owner._abortTimers = msg.abortTimers;
 			_owner._abortTimersMode = msg.abortMode;
 
 			if (_owner._abortTimersMode != ABORTMODE_1) {
@@ -473,9 +473,9 @@
 	msg.frameTimer = currentTimer + 3;
 	int x1 = 0, y1 = 0;
 
-	if (msg.flags & KMSG_4) {
+	if (msg.flags & KMSG_SEQ_ENTRY) {
 		MadsSequenceEntry &seqEntry = _owner._sequenceList[msg.sequenceIndex];
-		if (seqEntry.field_12) {
+		if (!seqEntry.nonFixed) {
 			SpriteAsset &spriteSet = _owner._spriteSlots.getSprite(seqEntry.spriteListIndex);
 			M4Sprite *frame = spriteSet.getFrame(seqEntry.frameIndex - 1);
 			x1 = frame->bounds().left;
@@ -486,7 +486,7 @@
 		}
 	}
 	
-	if (msg.flags & KMSG_2) {
+	if (msg.flags & KMSG_OWNER_TIMEOUT) {
 		if (word_8469E != 0) {
 			// TODO: Figure out various flags
 		} else {
@@ -498,7 +498,7 @@
 	x1 += msg.position.x;
 	y1 += msg.position.y;
 
-	if ((msg.flags & KMSG_8) && (msg.frameTimer >= currentTimer)) {
+	if ((msg.flags & KMSG_SCROLL) && (msg.frameTimer >= currentTimer)) {
 		msg.msg[msg.msgOffset] = msg.asciiChar;
 		char *msgP = &msg.msg[++msg.msgOffset];
 		*msgP = msg.asciiChar2;
@@ -507,9 +507,10 @@
 		msg.asciiChar2 = *(msgP + 1);
 
 		if (!msg.asciiChar) {
+			// End of message
 			*msgP = '\0';
-			msg.flags &= ~KMSG_8;
-		} else if (msg.flags & KMSG_1) {
+			msg.flags &= ~KMSG_SCROLL;
+		} else if (msg.flags & KMSG_QUOTED) {
 			*msgP = '"';
 			*(msgP + 1) = '\0';
 		}
@@ -520,8 +521,8 @@
 
 	int strWidth = _talkFont->getWidth(msg.msg, _owner._textSpacing); 
 
-	if (msg.flags & KMSG_30) {
-		x1 -= (msg.flags & KMSG_20) ? strWidth / 2 : strWidth;
+	if (msg.flags & (KMSG_RIGHT_ALIGN | KMSG_CENTER_ALIGN)) {
+		x1 -= (msg.flags & KMSG_CENTER_ALIGN) ? strWidth / 2 : strWidth;
 	}
 
 	// Make sure text appears entirely on-screen
@@ -854,7 +855,7 @@
 }
 
 int MadsSequenceList::add(int spriteListIndex, int v0, int frameIndex, int triggerCountdown, int delayTicks, int extraTicks, int numTicks, 
-		int msgX, int msgY, char field_12, char scale, uint8 depth, int frameInc, SpriteAnimType animType, int numSprites, 
+		int msgX, int msgY, bool nonFixed, char scale, uint8 depth, int frameInc, SpriteAnimType animType, int numSprites, 
 		int frameStart) {
 
 	// Find a free slot
@@ -882,7 +883,7 @@
 	_entries[timerIndex].frameInc = frameInc;
 	_entries[timerIndex].depth = depth;
 	_entries[timerIndex].scale = scale;
-	_entries[timerIndex].field_12 = field_12;
+	_entries[timerIndex].nonFixed = nonFixed;
 	_entries[timerIndex].msgPos.x = msgX;
 	_entries[timerIndex].msgPos.y = msgY;
 	_entries[timerIndex].numTicks = numTicks;
@@ -924,7 +925,7 @@
 	spriteSlot.depth = timerEntry.depth;
 	spriteSlot.scale = timerEntry.scale;
 	
-	if (timerEntry.field_12 == 0) {
+	if (!timerEntry.nonFixed) {
 		spriteSlot.xp = timerEntry.msgPos.x;
 		spriteSlot.yp = timerEntry.msgPos.y;
 	} else {

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-05-26 08:27:24 UTC (rev 49228)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-05-26 08:32:32 UTC (rev 49229)
@@ -139,8 +139,8 @@
 #define TIMED_TEXT_SIZE 10
 #define TEXT_4A_SIZE 30
 
-enum KernelMessageFlags {KMSG_1 = 1, KMSG_2 = 2, KMSG_4 = 4, KMSG_8 = 8, KMSG_20 = 0x20, KMSG_30 = 0x30, 
-	KMSG_40 = 0x40, KMSG_ACTIVE = 0x80};
+enum KernelMessageFlags {KMSG_QUOTED = 1, KMSG_OWNER_TIMEOUT = 2, KMSG_SEQ_ENTRY = 4, KMSG_SCROLL = 8, KMSG_RIGHT_ALIGN = 0x10, 
+	KMSG_CENTER_ALIGN = 0x20, KMSG_EXPIRE = 0x40, KMSG_ACTIVE = 0x80};
 
 class MadsKernelMessageEntry {
 public:
@@ -157,7 +157,7 @@
 	uint32 frameTimer2;
 	uint32 frameTimer;
 	uint32 timeout;
-	bool field_1C;
+	int abortTimers;
 	AbortTimerMode abortMode;
 	uint16 actionNouns[3];
 	char msg[100];
@@ -174,9 +174,9 @@
 	MadsKernelMessageList(MadsView &owner);
 
 	void clear();
-	int add(const Common::Point &pt, uint fontColour, uint8 flags, uint8 v2, uint32 timeout, const char *msg);
-	int addQuote(int quoteId, int v2, uint32 timeout);
-	void unk1(int msgIndex, int v1, int v2);
+	int add(const Common::Point &pt, uint fontColour, uint8 flags, uint8 abortTimers, uint32 timeout, const char *msg);
+	int addQuote(int quoteId, int abortTimers, uint32 timeout);
+	void scrollMessage(int msgIndex, int numTicks, bool quoted);
 	void setSeqIndex(int msgIndex, int seqIndex);
 	void remove(int msgIndex);
 	void reset();
@@ -313,7 +313,7 @@
 	int scale;
 	int dynamicHotspotIndex;
 
-	int field_12;
+	bool nonFixed;
 	int field_13;
 	
 	Common::Point msgPos;
@@ -341,7 +341,7 @@
 	void clear();
 	bool addSubEntry(int index, SequenceSubEntryMode mode, int frameIndex, int abortVal);
 	int add(int spriteListIndex, int v0, int v1, int triggerCountdown, int delayTicks, int extraTicks, int numTicks, 
-		int msgX, int msgY, char field_12, char scale, uint8 depth, int frameInc, SpriteAnimType animType, 
+		int msgX, int msgY, bool nonFixed, char scale, uint8 depth, int frameInc, SpriteAnimType animType, 
 		int numSprites, int frameStart);
 	void remove(int timerIndex);
 	void setSpriteSlot(int timerIndex, MadsSpriteSlot &spriteSlot);


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

Revision: 49286
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49286&view=rev
Author:   dreammaster
Date:     2010-05-28 10:17:16 +0000 (Fri, 28 May 2010)

Log Message:
-----------
Implemented needed methods for scrolling surfaces horizontally or vertically

Modified Paths:
--------------
    scummvm/trunk/engines/m4/graphics.cpp
    scummvm/trunk/engines/m4/graphics.h

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2010-05-28 09:29:05 UTC (rev 49285)
+++ scummvm/trunk/engines/m4/graphics.cpp	2010-05-28 10:17:16 UTC (rev 49286)
@@ -738,6 +738,71 @@
 	delete intStream;
 }
 
+void M4Surface::scrollX(int xAmount) {
+	if (xAmount == 0)
+		return;
+
+	byte buffer[80];
+	int direction = (xAmount > 0) ? 1 : -1;
+	int xSize = ABS(xAmount);
+	assert(xSize <= 80);
+
+	byte *srcP = (byte *)getBasePtr(0, 0);
+
+	for (int y = 0; y < height(); ++y, srcP += pitch) {
+		if (direction < 0) {
+			// Copy area to be overwritten
+			Common::copy(srcP, srcP + xSize, &buffer[0]);
+			// Shift the remainder of the line over the given area
+			Common::copy(srcP + xSize, srcP + width(), srcP);
+			// Move buffered area to the end of the line
+			Common::copy(&buffer[0], &buffer[xSize], srcP + width() - xSize);
+		} else {
+			// Copy area to be overwritten
+			Common::copy_backward(srcP + width() - xSize, srcP + width(), &buffer[80]);
+			// Shift the remainder of the line over the given area
+			Common::copy_backward(srcP, srcP + width() - xSize, srcP + width());
+			// Move buffered area to the start of the line
+			Common::copy_backward(&buffer[80 - xSize], &buffer[80], srcP + xSize);
+		}
+	}
+}
+
+void M4Surface::scrollY(int yAmount) {
+	if (yAmount == 0)
+		return;
+
+	int direction = (yAmount > 0) ? 1 : -1;
+	int ySize = ABS(yAmount);
+	assert(ySize < (height() / 2));
+	assert(width() == pitch);
+
+	int blockSize = ySize * width();
+	byte *tempData = (byte *)malloc(blockSize);
+	byte *pixelsP = (byte *)getBasePtr(0, 0);
+
+	if (direction > 0) {
+		// Buffer the lines to be overwritten
+		byte *srcP = (byte *)getBasePtr(0, height() - ySize);
+		Common::copy(srcP, srcP + (pitch * ySize), tempData);
+		// Vertically shift all the lines
+		Common::copy_backward(pixelsP, pixelsP + (pitch * (height() - ySize)),
+			pixelsP + (pitch * height()));
+		// Transfer the buffered lines top the top of the screen
+		Common::copy(tempData, tempData + blockSize, pixelsP);
+	} else {
+		// Buffer the lines to be overwritten
+		Common::copy(pixelsP, pixelsP + (pitch * ySize), tempData);
+		// Vertically shift all the lines
+		Common::copy(pixelsP + (pitch * ySize), pixelsP + (pitch * height()), pixelsP);
+		// Transfer the buffered lines to the bottom of the screen
+		Common::copy(tempData, tempData + blockSize, pixelsP + (pitch * (height() - ySize))); 
+	}
+
+	::free(tempData);
+}
+
+
 void M4Surface::translate(RGBList *list, bool isTransparent) {
 	byte *p = getBasePtr(0, 0);
 	byte *palIndexes = list->palIndexes();

Modified: scummvm/trunk/engines/m4/graphics.h
===================================================================
--- scummvm/trunk/engines/m4/graphics.h	2010-05-28 09:29:05 UTC (rev 49285)
+++ scummvm/trunk/engines/m4/graphics.h	2010-05-28 10:17:16 UTC (rev 49286)
@@ -173,8 +173,9 @@
 		dest->copyFrom(this, destX, destY, depth, depthsSurface, scale, transparentColour);
 	}
 
+	void scrollX(int xAmount);
+	void scrollY(int yAmount);
 
-
 	void translate(RGBList *list, bool isTransparent = false);
 };
 


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

Revision: 49287
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49287&view=rev
Author:   dreammaster
Date:     2010-05-28 10:20:02 +0000 (Fri, 28 May 2010)

Log Message:
-----------
Clarified variable usage for sequence list entry indexes

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

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-05-28 10:17:16 UTC (rev 49286)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-05-28 10:20:02 UTC (rev 49287)
@@ -619,7 +619,7 @@
 	// Set up a default sprite slot entry for a full screen refresh
 	_spriteSlots.startIndex = 1;
 	_spriteSlots[0].spriteType = FULL_SCREEN_REFRESH;
-	_spriteSlots[0].timerIndex = -1;
+	_spriteSlots[0].seqIndex = -1;
 }
 
 void RexDialogView::initialiseGraphics() {
@@ -796,7 +796,7 @@
 void RexDialogView::setFrame(int frameNumber, int depth) {
 	int slotIndex = _spriteSlots.getIndex();
 	_spriteSlots[slotIndex].spriteType = FOREGROUND_SPRITE;
-	_spriteSlots[slotIndex].timerIndex = 1;
+	_spriteSlots[slotIndex].seqIndex = 1;
 	_spriteSlots[slotIndex].spriteListIndex = 0; //_menuSpritesIndex;
 	_spriteSlots[slotIndex].frameNumber = frameNumber;
 

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-05-28 10:17:16 UTC (rev 49286)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-05-28 10:20:02 UTC (rev 49287)
@@ -59,7 +59,7 @@
 	// Reset the sprite slots list back to a single entry for a full screen refresh
 	startIndex = 1;
 	_entries[0].spriteType = FULL_SCREEN_REFRESH;
-	_entries[0].timerIndex = -1;
+	_entries[0].seqIndex = -1;
 }
 
 int MadsSpriteSlots::getIndex() {
@@ -84,10 +84,10 @@
 /*
  * Deletes the sprite slot with the given timer entry
  */
-void MadsSpriteSlots::deleteTimer(int timerIndex) {
+void MadsSpriteSlots::deleteTimer(int seqIndex) {
 	for (int idx = 0; idx < startIndex; ++idx) {
-		if (_entries[idx].timerIndex == timerIndex)
-			_entries[idx].spriteType = -1;
+		if (_entries[idx].seqIndex == seqIndex)
+			_entries[idx].spriteType = EXPIRED_SPRITE;
 	}
 }
 
@@ -204,6 +204,16 @@
 }
 
 /**
+ * Flags the entire screen to be redrawn during the next drawing cycle
+ */
+void MadsSpriteSlots::fullRefresh() {
+	int idx = getIndex();
+
+	_entries[idx].spriteType = FULL_SCREEN_REFRESH;
+	_entries[idx].seqIndex = -1;
+}
+
+/**
  * Removes any sprite slots that are no longer needed
  */
 void MadsSpriteSlots::cleanUp() {
@@ -859,10 +869,10 @@
 		int frameStart) {
 
 	// Find a free slot
-	uint timerIndex = 0;
-	while ((timerIndex < _entries.size()) && (_entries[timerIndex].active))
-		++timerIndex;
-	if (timerIndex == _entries.size())
+	uint seqIndex = 0;
+	while ((seqIndex < _entries.size()) && (_entries[seqIndex].active))
+		++seqIndex;
+	if (seqIndex == _entries.size())
 		error("TimerList full");
 
 	if (frameStart <= 0)
@@ -873,53 +883,53 @@
 		frameInc = 0;
 
 	// Set the list entry fields
-	_entries[timerIndex].active = true;
-	_entries[timerIndex].spriteListIndex = spriteListIndex;
-	_entries[timerIndex].field_2 = v0;
-	_entries[timerIndex].frameIndex = frameIndex;
-	_entries[timerIndex].frameStart = frameStart;
-	_entries[timerIndex].numSprites = numSprites;
-	_entries[timerIndex].animType = animType;
-	_entries[timerIndex].frameInc = frameInc;
-	_entries[timerIndex].depth = depth;
-	_entries[timerIndex].scale = scale;
-	_entries[timerIndex].nonFixed = nonFixed;
-	_entries[timerIndex].msgPos.x = msgX;
-	_entries[timerIndex].msgPos.y = msgY;
-	_entries[timerIndex].numTicks = numTicks;
-	_entries[timerIndex].extraTicks = extraTicks;
+	_entries[seqIndex].active = true;
+	_entries[seqIndex].spriteListIndex = spriteListIndex;
+	_entries[seqIndex].field_2 = v0;
+	_entries[seqIndex].frameIndex = frameIndex;
+	_entries[seqIndex].frameStart = frameStart;
+	_entries[seqIndex].numSprites = numSprites;
+	_entries[seqIndex].animType = animType;
+	_entries[seqIndex].frameInc = frameInc;
+	_entries[seqIndex].depth = depth;
+	_entries[seqIndex].scale = scale;
+	_entries[seqIndex].nonFixed = nonFixed;
+	_entries[seqIndex].msgPos.x = msgX;
+	_entries[seqIndex].msgPos.y = msgY;
+	_entries[seqIndex].numTicks = numTicks;
+	_entries[seqIndex].extraTicks = extraTicks;
 
-	_entries[timerIndex].timeout = _madsVm->_currentTimer + delayTicks;
+	_entries[seqIndex].timeout = _madsVm->_currentTimer + delayTicks;
 
-	_entries[timerIndex].triggerCountdown = triggerCountdown;
-	_entries[timerIndex].doneFlag = false;
-	_entries[timerIndex].field_13 = 0;
-	_entries[timerIndex].dynamicHotspotIndex = -1;
-	_entries[timerIndex].entries.count = 0;
-	_entries[timerIndex].abortMode = _owner._abortTimersMode2;
+	_entries[seqIndex].triggerCountdown = triggerCountdown;
+	_entries[seqIndex].doneFlag = false;
+	_entries[seqIndex].field_13 = 0;
+	_entries[seqIndex].dynamicHotspotIndex = -1;
+	_entries[seqIndex].entries.count = 0;
+	_entries[seqIndex].abortMode = _owner._abortTimersMode2;
 
 	for (int i = 0; i < 3; ++i)
-		_entries[timerIndex].actionNouns[i] = _madsVm->scene()->actionNouns[i];
+		_entries[seqIndex].actionNouns[i] = _madsVm->scene()->actionNouns[i];
 
-	return timerIndex;
+	return seqIndex;
 }
 
-void MadsSequenceList::remove(int timerIndex) {
-	if (_entries[timerIndex].active) {
-		if (_entries[timerIndex].dynamicHotspotIndex >= 0)
-			_owner._dynamicHotspots.remove(_entries[timerIndex].dynamicHotspotIndex);
+void MadsSequenceList::remove(int seqIndex) {
+	if (_entries[seqIndex].active) {
+		if (_entries[seqIndex].dynamicHotspotIndex >= 0)
+			_owner._dynamicHotspots.remove(_entries[seqIndex].dynamicHotspotIndex);
 	}
 
-	_entries[timerIndex].active = false;
-	_owner._spriteSlots.deleteTimer(timerIndex);
+	_entries[seqIndex].active = false;
+	_owner._spriteSlots.deleteTimer(seqIndex);
 }
 
-void MadsSequenceList::setSpriteSlot(int timerIndex, MadsSpriteSlot &spriteSlot) {
-	MadsSequenceEntry &timerEntry = _entries[timerIndex];
+void MadsSequenceList::setSpriteSlot(int seqIndex, MadsSpriteSlot &spriteSlot) {
+	MadsSequenceEntry &timerEntry = _entries[seqIndex];
 	SpriteAsset &sprite = _owner._spriteSlots.getSprite(timerEntry.spriteListIndex);
 
 	spriteSlot.spriteType = sprite.getAssetType() == 1 ? BACKGROUND_SPRITE : FOREGROUND_SPRITE;
-	spriteSlot.timerIndex = timerIndex;
+	spriteSlot.seqIndex = seqIndex;
 	spriteSlot.spriteListIndex = timerEntry.spriteListIndex;
 	spriteSlot.frameNumber = ((timerEntry.field_2 == 1) ? 0x8000 : 0) | timerEntry.frameIndex;
 	spriteSlot.depth = timerEntry.depth;
@@ -934,15 +944,15 @@
 	}
 }
 
-bool MadsSequenceList::loadSprites(int timerIndex) {
-	MadsSequenceEntry &seqEntry = _entries[timerIndex];
+bool MadsSequenceList::loadSprites(int seqIndex) {
+	MadsSequenceEntry &seqEntry = _entries[seqIndex];
 	int slotIndex;
 	bool result = false;
 	int idx = -1;
 
-	_owner._spriteSlots.deleteTimer(timerIndex);
+	_owner._spriteSlots.deleteTimer(seqIndex);
 	if (seqEntry.doneFlag) {
-		remove(timerIndex);
+		remove(seqIndex);
 		return false;
 	}
 
@@ -951,7 +961,7 @@
 		seqEntry.doneFlag = true;
 	} else if ((slotIndex = _owner._spriteSlots.getIndex()) >= 0) {
 		MadsSpriteSlot &spriteSlot = _owner._spriteSlots[slotIndex];
-		setSpriteSlot(timerIndex, spriteSlot);
+		setSpriteSlot(seqIndex, spriteSlot);
 
 		int x2 = 0, y2 = 0;
 
@@ -1079,8 +1089,8 @@
 	}
 }
 
-void MadsSequenceList::setAnimRange(int timerIndex, int startVal, int endVal) {
-	MadsSequenceEntry &seqEntry = _entries[timerIndex];
+void MadsSequenceList::setAnimRange(int seqIndex, int startVal, int endVal) {
+	MadsSequenceEntry &seqEntry = _entries[seqIndex];
 	SpriteAsset &spriteSet = _owner._spriteSlots.getSprite(seqEntry.spriteListIndex);
 	int numSprites = spriteSet.getCount();
 	int tempStart = startVal, tempEnd = endVal;

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-05-28 10:17:16 UTC (rev 49286)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-05-28 10:20:02 UTC (rev 49287)
@@ -46,7 +46,7 @@
 class MadsSpriteSlot {
 public:
 	int spriteType;
-	int timerIndex;
+	int seqIndex;
 	int spriteListIndex;
 	int frameNumber;
 	int xp;
@@ -60,7 +60,7 @@
 #define SPRITE_SLOTS_SIZE 50
 
 enum SpriteIdSpecial {
-	BACKGROUND_SPRITE = -4, FULL_SCREEN_REFRESH = -2, FOREGROUND_SPRITE = 1
+	BACKGROUND_SPRITE = -4, FULL_SCREEN_REFRESH = -2, FOREGROUND_SPRITE = 1, EXPIRED_SPRITE = -1
 };
 
 typedef Common::Array<Common::SharedPtr<SpriteAsset> > SpriteList;
@@ -87,11 +87,12 @@
 	int getIndex();
 	int addSprites(const char *resName);
 	void clear();
-	void deleteTimer(int timerIndex);
+	void deleteTimer(int seqIndex);
 
 	void drawBackground();
 	void drawForeground(View *view);
 	void setDirtyAreas();
+	void fullRefresh();
 	void cleanUp();
 };
 
@@ -343,12 +344,12 @@
 	int add(int spriteListIndex, int v0, int v1, int triggerCountdown, int delayTicks, int extraTicks, int numTicks, 
 		int msgX, int msgY, bool nonFixed, char scale, uint8 depth, int frameInc, SpriteAnimType animType, 
 		int numSprites, int frameStart);
-	void remove(int timerIndex);
-	void setSpriteSlot(int timerIndex, MadsSpriteSlot &spriteSlot);
-	bool loadSprites(int timerIndex);
+	void remove(int seqIndex);
+	void setSpriteSlot(int seqIndex, MadsSpriteSlot &spriteSlot);
+	bool loadSprites(int seqIndex);
 	void tick();
 	void delay(uint32 v1, uint32 v2);
-	void setAnimRange(int timerIndex, int startVal, int endVal);
+	void setAnimRange(int seqIndex, int startVal, int endVal);
 };
 
 class MadsView {


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

Revision: 49347
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49347&view=rev
Author:   dreammaster
Date:     2010-05-31 12:10:30 +0000 (Mon, 31 May 2010)

Log Message:
-----------
In progress work implementing the animation player

Modified Paths:
--------------
    scummvm/trunk/engines/m4/animation.cpp
    scummvm/trunk/engines/m4/animation.h
    scummvm/trunk/engines/m4/assets.cpp
    scummvm/trunk/engines/m4/assets.h
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/console.h
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/m4.h
    scummvm/trunk/engines/m4/mads_views.cpp
    scummvm/trunk/engines/m4/mads_views.h

Modified: scummvm/trunk/engines/m4/animation.cpp
===================================================================
--- scummvm/trunk/engines/m4/animation.cpp	2010-05-31 11:25:59 UTC (rev 49346)
+++ scummvm/trunk/engines/m4/animation.cpp	2010-05-31 12:10:30 UTC (rev 49347)
@@ -31,177 +31,397 @@
 
 // TODO: this code needs cleanup
 
-Animation::Animation(MadsM4Engine *vm) {
-	_vm = vm;
+MadsAnimation::MadsAnimation(MadsM4Engine *vm, MadsView *view): Animation(vm), _view(view) {
 	_playing = false;
+	_font = NULL;
+	_unk1 = 0;
+	_skipLoad = false;
+	_unkIndex = -1;
+	_messageCtr= 0;
 }
 
-void Animation::loadFullScreen(const char *filename) {
-	_vm->_palette->deleteAllRanges();
-	load(filename);
+MadsAnimation::~MadsAnimation() {
+	delete _font;
 }
 
-void Animation::load(const char *filename) {
-	MadsPack anim(filename, _vm);
+void MadsAnimation::load(const Common::String &filename) {
+	MadsPack anim(filename.c_str(), _vm);
+	bool madsRes = filename[0] == '*';
 	char buffer[20];
+	int streamIndex = 1;
 
 	// Chunk 1: header
 	// header
-	// TODO: there are some unknown fields here, plus we don't read
-	// the entire chunk
+
 	Common::SeekableReadStream *animStream = anim.getItemStream(0);
-	Common::SeekableReadStream *spriteSeriesStream;
-	//printf("Chunk 0, size %i\n", animStream->size());
-	_seriesCount = animStream->readUint16LE();
-	_frameCount = animStream->readUint16LE();
-	_frameEntryCount = animStream->readUint16LE();
 
-	// Unknown
-	for (int i = 0; i < 43; i++)
-		animStream->readByte();
+	int spriteListCount = animStream->readUint16LE();
+	int miscEntriesCount = animStream->readUint16LE();
+	int frameEntryCount = animStream->readUint16LE();
+	int messagesCount = animStream->readUint16LE();
+	animStream->skip(1);
+	_flags = animStream->readByte();
 
-	_spriteSeriesNames = new Common::String[_seriesCount];
-	printf("%i sprite series\n", _seriesCount);
+	animStream->skip(2);
+	_animMode = animStream->readUint16LE();
+	assert(_animMode != 4);
+	_roomNumber = animStream->readUint16LE();
+	_field12 = animStream->readUint16LE() != 0;
+	animStream->skip(4);
+	_spriteListIndex = animStream->readUint16LE();
+	_scrollX = animStream->readUint16LE();
+	_scrollY = animStream->readSint16LE();
+	animStream->skip(10);
+	
+	animStream->read(buffer, 13);
+	_field24 = Common::String(buffer, 13);
 
-	// TODO: for now, we only load the first sprite series
-	if (_seriesCount > 1)
-		printf("TODO: Anim has %i sprite series, for now, we only load the first one\n", _seriesCount);
-	_seriesCount = 1;		// TODO
-
-	for (int i = 0; i < _seriesCount; i++) {
+	for (int i = 0; i < 10; ++i) {
 		animStream->read(buffer, 13);
-		_spriteSeriesNames[i] = Common::String(buffer);
-		//printf("%03d: %s\n", i, _spriteSeriesNames[i].c_str());
+		_spriteSetNames[i] = Common::String(buffer, 13);
+	}
 
-		spriteSeriesStream = _vm->res()->get(_spriteSeriesNames[i].c_str());
-		_spriteSeries = new SpriteAsset(_vm, spriteSeriesStream,
-										spriteSeriesStream->size(), _spriteSeriesNames[i].c_str());
-		_vm->res()->toss(_spriteSeriesNames[i].c_str());
+	animStream->skip(81);
+	animStream->read(buffer, 13);
+	_lbmFilename = Common::String(buffer, 13);
+	animStream->read(buffer, 13);
+	_spritesFilename = Common::String(buffer, 13);
+	animStream->skip(48);
+	animStream->read(buffer, 13);
+	_soundName = Common::String(buffer, 13);
+	animStream->skip(26);
+	animStream->read(buffer, 13);
+	Common::String fontResource(buffer, 13);
 
-		// Adjust the palette of the sprites in the sprite series
-		// so that they can be displayed on screen correctly
-		RGBList *palData = new RGBList(_spriteSeries->getColorCount(), _spriteSeries->getPalette(), true);
-		_vm->_palette->addRange(palData);
+	// TODO: Based on a weird usage of a flags word, a secondary method gets called here.
+	// Figure out secondary method, and when/if it's called
 
-		for (int k = 0; k < _spriteSeries->getCount(); k++) {
-			M4Sprite *spr = _spriteSeries->getFrame(k);
-			spr->translate(palData);		// sprite pixel translation
+	// Initialise the reference list
+	for (int i = 0; i < spriteListCount; ++i)
+		_spriteListIndexes.push_back(-1);
+
+	delete animStream;
+
+	if (messagesCount > 0) {
+		// Chunk 2
+		// Following is a list of any messages for the animation
+
+		Common::SeekableReadStream *animStream = anim.getItemStream(streamIndex++);
+
+		for (int i = 0; i < messagesCount; ++i) {
+			AnimMessage rec;
+			animStream->read(rec.msg, 70);
+			rec.pos.x = animStream->readUint16LE();
+			rec.pos.y = animStream->readUint16LE();
+			animStream->readUint16LE();
+			rec.rgb1.r = animStream->readByte();
+			rec.rgb1.g = animStream->readByte();
+			rec.rgb1.b = animStream->readByte();
+			rec.rgb2.r = animStream->readByte();
+			rec.rgb2.g = animStream->readByte();
+			rec.rgb2.b = animStream->readByte();
+			rec.kernelMsgIndex = animStream->readUint16LE();
+			animStream->skip(6);
+			rec.startFrame = animStream->readUint16LE();
+			rec.endFrame = animStream->readUint16LE();
+			animStream->readUint16LE();
+
+			_messages.push_back(rec);
 		}
+
+		delete animStream;
 	}
 
-	//printf("End pos: %i\n", animStream->pos());
+	if (frameEntryCount > 0) {
+		// Chunk 3: animation frame info
+		animStream = anim.getItemStream(streamIndex++);
 
-	delete animStream;
+		for (int i = 0; i < frameEntryCount; i++) {
+			AnimFrameEntry rec;
+			rec.frameNumber = animStream->readUint16LE();
+			rec.seqIndex = animStream->readByte();
+			rec.spriteSlot.frameNumber = animStream->readUint16LE();
+			rec.spriteSlot.xp = animStream->readUint16LE();
+			rec.spriteSlot.yp = animStream->readUint16LE();
+			rec.spriteSlot.depth = animStream->readUint16LE();
+			rec.spriteSlot.scale = animStream->readUint16LE();
 
-	// ------------------
+			_frameEntries.push_back(rec);
+		}
 
-	// Chunk 2: anim info
-	AnimationFrame frame;
-	animStream = anim.getItemStream(1);
-	//printf("Chunk 1, size %i\n", animStream->size());
+		delete animStream;
+	}
 
-	_frameEntries = new AnimationFrame[_frameEntryCount];
+	if (miscEntriesCount > 0) {
+		// Chunk 4: Misc Data
+		animStream = anim.getItemStream(streamIndex);
 
-	for (int i = 0; i < _frameEntryCount; i++) {
+		for (int i = 0; i < miscEntriesCount; ++i) {
+			AnimMiscEntry rec;
+			rec.soundNum = animStream->readUint16LE();
+			rec.numTicks = animStream->readUint16LE();
+			rec.posAdjust.x = animStream->readUint16LE();
+			rec.posAdjust.y = animStream->readUint16LE();
+			animStream->readUint16LE();
 
-		frame.animFrameIndex = animStream->readUint16LE();
-		frame.u = animStream->readByte();
-		frame.seriesIndex = animStream->readByte();
-		frame.seriesFrameIndex = animStream->readUint16LE();
-		frame.x = animStream->readUint16LE();
-		frame.y = animStream->readUint16LE();
-		frame.v = animStream->readByte();
-		frame.w = animStream->readByte();
+			_miscEntries.push_back(rec);
+		}
 
-		_frameEntries[i] = frame;
+		delete animStream;
+	}
 
-		/*
-		printf(
-		"animFrameIndex = %4d, "
-		"u = %3d, "
-		"seriesIndex = %3d, "
-		"seriesFrameIndex = %6d, "
-		"x = %3d, "
-		"y = %3d, "
-		"v = %3d, "
-		"w = %3d\n",
+	// If the animation specifies a font, then load it for access
+	if (_flags & ANIM_CUSTOM_FONT) {
+		Common::String fontName;
+		if (madsRes)
+			fontName += "*";
+		fontName += fontResource;
 
-		frame.animFrameIndex,
-		frame.u,
-		frame.seriesIndex,
-		frame.seriesFrameIndex,
-		frame.x,
-		frame.y,
-		frame.v,
-		frame.w
-		);
-		*/
+		_font = _vm->_font->getFont(fontName);
 	}
-	//printf("End pos: %i\n", animStream->pos());
 
-	delete animStream;
+	// Load all the sprite sets for the animation
+	for (int i = 0; i < spriteListCount; ++i) {
+		_spriteListIndexes[i] = _view->_spriteSlots.addSprites(_spriteSetNames[i].c_str());
+	}
 
-	// Chunk 3: unknown (seems to be sound data?)
-	// TODO
-}
 
-Animation::~Animation() {
-	//delete[] _spriteSeriesNames;
-	//delete[] _spriteSeries;
-	//delete[] _frameEntries;
+	if (_field12) {
+		Common::String resName;
+		if (madsRes)
+			resName += "*";
+		resName += _spriteSetNames[_spriteListIndex];
+		
+		_spriteListIndexes[_spriteListIndex] = _view->_spriteSlots.addSprites(resName.c_str());
+	}
+
+	// TODO: Unknown section about handling palette entries - I think it's adjusting sprite sets
+	// to the palette of the game screen
+
+	// Process the sprite list indexes to remap them to the actual sprite list indexes
+	
 }
 
-void Animation::start() {
-	_curFrame = 0;
-	_curFrameEntry = 0;
+void MadsAnimation::start() {
+	_currentFrame = 0;
+	_oldFrameEntry = 0;
 	//for (int i = 0; i < _seriesCount; i++) {
 		//_spriteSeries[i] = new SpriteSeries((char*)_spriteSeriesNames[i].c_str());
 	//}
 	_playing = true;
-	updateAnim();
+	update();
 }
 
-bool Animation::updateAnim() {
+bool MadsAnimation::update() {
 	if (!_playing)
 		return true;
 
-	// Get the scene background surface
-	M4Surface *bg = _vm->_scene->getBackgroundSurface();
+	if (_field12) {
+		int spriteListIndex = _spriteListIndexes[_spriteListIndex];
+		int newIndex = -1;
+		
+		for (uint idx = _oldFrameEntry; idx < _frameEntries.size(); ++idx) {
+			if (_frameEntries[idx].frameNumber > _currentFrame)
+				break;
+			if (_frameEntries[idx].spriteSlot.spriteListIndex == spriteListIndex)
+				newIndex = _frameEntries[idx].spriteSlot.frameNumber;
+		}
 
-	while (_frameEntries[_curFrameEntry].animFrameIndex == _curFrame) {
-		AnimationFrame *frame = &_frameEntries[_curFrameEntry];
-		int seriesFrameIndex = (frame->seriesFrameIndex & 0x7FFF) - 1;
+		if (newIndex >= 0)
+			load1(newIndex);
+	}
 
-		// Write the sprite onto the screen
-		M4Sprite *spr = _spriteSeries->getFrame(seriesFrameIndex);
+	// If it's not time for the next frame, then exit
+	if (_madsVm->_currentTimer < _nextFrameTimer)
+		return false;
 
-		// FIXME: correct x, y
-		spr->copyTo(bg, frame->x, frame->y, (int)spr->getTransparentColor());
+	// Loop checks for any prior animation sprite slots to be expired
+	for (int slotIndex = 0; slotIndex < _view->_spriteSlots.startIndex; ++slotIndex) {
+		if ((_view->_spriteSlots[slotIndex].seqIndex >= 0x80) &&
+			(_view->_spriteSlots[slotIndex].seqIndex <= 0xFD)) {
+			// Flag the frame as animation sprite slot
+			_view->_spriteSlots[slotIndex].spriteType = EXPIRED_SPRITE;
+		}
+	}
 
-		// HACK: wait a bit
-		g_system->delayMillis(100);
+	// Validate the current frame
+	if (_currentFrame > (int)_miscEntries.size()) {
+		// Is the animation allowed to be repeated?
+		if (_resetFlag) {
+			_currentFrame = 0;
+			_oldFrameEntry = 0;
+		} else {
+			_unk1 = true;
+			return true;
+		}
+	}
 
-		//printf("_curFrameEntry = %d\n", _curFrameEntry);
-		_curFrameEntry++;
+	// Handle starting any sound for this frame
+	AnimMiscEntry &misc = _miscEntries[_currentFrame];
+	if (misc.soundNum)
+		_vm->_sound->playSound(misc.soundNum);
+
+	bool screenChanged = false;
+
+	// Handle any scrolling of the screen surface
+	if ((_scrollX != 0) || (_scrollY != 0)) {
+		_view->_bgSurface->scrollX(_scrollX);
+		_view->_bgSurface->scrollY(_scrollY);
+
+		screenChanged = true;
 	}
 
-	//printf("_curFrame = %d\n", _curFrame);
+	// Handle any offset adjustment for sprites as of this frame
+	if (_view->_posAdjust.x != misc.posAdjust.x) {
+		misc.posAdjust.x = _view->_posAdjust.x;
+		screenChanged = true;
+	}
+	if (_view->_posAdjust.y != misc.posAdjust.y) {
+		misc.posAdjust.y = _view->_posAdjust.y;
+		screenChanged = true;
+	}
+	if (screenChanged) {
+		// Signal the entire screen needs refreshing
+		_view->_spriteSlots.fullRefresh();
+	}
 
-	_curFrame++;
-	if (_curFrame >= _frameCount)		// anim done
+	int spriteSlotsMax = _view->_spriteSlots.startIndex;
+
+	// Main frame animation loop - frames get animated by being placed, as necessary, into the
+	// main sprite slot array
+	while ((uint)_oldFrameEntry < _frameEntries.size()) {
+		if (_frameEntries[_oldFrameEntry].frameNumber > _currentFrame)
+			break;
+		else if (_frameEntries[_oldFrameEntry].frameNumber == _currentFrame) {
+			// Found the correct frame 
+			int spriteSlotIndex = 0;
+			int index = 0;
+
+			for (;;) {
+				if ((spriteSlotIndex == 0) && (index < spriteSlotsMax)) {
+					int seqIndex = _frameEntries[_oldFrameEntry].seqIndex - _view->_spriteSlots[index].seqIndex;
+					if (seqIndex == 0x80) {
+						if (_view->_spriteSlots[index] == _frameEntries[_oldFrameEntry].spriteSlot)
+							_view->_spriteSlots[index].spriteType = SPRITE_ZERO;
+					}
+					++index;
+					continue;
+				} 
+				
+				if (spriteSlotIndex == 0) {
+					int slotIndex = _view->_spriteSlots.getIndex();
+					_view->_spriteSlots[slotIndex].copy(_frameEntries[_oldFrameEntry].spriteSlot);
+					_view->_spriteSlots[slotIndex].seqIndex += 0x80;
+					
+					SpriteAsset &spriteSet = _view->_spriteSlots.getSprite(
+						_view->_spriteSlots[slotIndex].spriteListIndex);
+
+					_view->_spriteSlots[slotIndex].spriteType = (spriteSet.getAssetType() == 0) ?
+						SPRITE_FOUR : SPRITE_ZERO;
+				}
+				break;
+			}
+		}
+		
+		++_oldFrameEntry;
+	}
+
+	// Handle the display of any messages
+	for (uint idx = 0; idx < _messages.size(); ++idx) {
+		if (_messages[idx].kernelMsgIndex >= 0) {
+			// Handle currently active message
+			if ((_currentFrame < _messages[idx].startFrame) || (_currentFrame > _messages[idx].endFrame)) {
+				_view->_kernelMessages.remove(_messages[idx].kernelMsgIndex);
+				_messages[idx].kernelMsgIndex = -1;
+				--_messageCtr;
+			}
+		} else if ((_currentFrame >= _messages[idx].startFrame) && (_currentFrame <= _messages[idx].endFrame)) {
+			// Start displaying the message
+			AnimMessage &me = _messages[idx];
+
+			// The colour index to use is dependant on how many messages are currently on-screen
+			uint8 colIndex;
+			switch (_messageCtr) {
+			case 1:
+				colIndex = 252;
+				break;
+			case 2:
+				colIndex = 16;
+				break;
+			default:
+				colIndex = 250;
+				break;
+			}
+
+			_vm->_palette->setEntry(colIndex, me.rgb1.r, me.rgb1.g, me.rgb1.b);
+			_vm->_palette->setEntry(colIndex + 1, me.rgb2.r, me.rgb2.g, me.rgb2.b);
+
+			// Add a kernel message to display the given text
+			me.kernelMsgIndex = _view->_kernelMessages.add(me.pos, colIndex * 101, 0, 0, INDEFINITE_TIMEOUT, me.msg);
+			++_messageCtr;
+		}
+	}
+
+	// Move to the next frame
+	_currentFrame++;
+	if (_currentFrame >= (int)_miscEntries.size()) {
+		// Animation is complete
 		stop();
 
-	return _curFrame >= _frameCount;
+		if (_abortTimers != 0) {
+			_view->_abortTimers = _abortTimers;
+			_view->_abortTimersMode = _abortMode;
+
+			if (_abortMode != ABORTMODE_1) {
+				// Copy the noun list
+				for (int i = 0; i < 3; ++i)
+					_madsVm->scene()->actionNouns[i] = _actionNouns[i];
+			}
+		}
+	}
+
+	int frameNum = MIN(_currentFrame, (int)_miscEntries.size() - 1);
+	_nextFrameTimer = _madsVm->_currentTimer + _miscEntries[frameNum].numTicks;
+
+	return _currentFrame >= (int)_miscEntries.size();
 }
 
-void Animation::stop() {
+void MadsAnimation::stop() {
 	_playing = false;
+}
 
-	for (int i = 0; i < _seriesCount; i++) {
-		// TODO: cleanup
-		//delete _spriteSeries[i];
-		//_spriteSeries[i] = NULL;
+void MadsAnimation::setCurrentFrame(int frameNumber) {
+	_currentFrame = frameNumber;
+	_oldFrameEntry = 0;
+	_unk1 = 0;
+}
+
+void MadsAnimation::load1(int frameNumber) {
+	if (_skipLoad)
+		return;
+
+	Common::Point pt;
+	int listIndex = _spriteListIndexes[_spriteListIndex];
+	SpriteAsset &spriteSet = _view->_spriteSlots.getSprite(listIndex);
+
+	if (_unkIndex < 0) {
+		M4Surface *frame = spriteSet.getFrame(0);
+		pt.x = frame->bounds().left;
+		pt.y = frame->bounds().top;
+	} else {
+		pt.x = _unkList[_unkIndex].x;
+		pt.y = _unkList[_unkIndex].y;
+		_unkIndex = 1 - _unkIndex;
 	}
+
+	if (proc1(spriteSet, pt, frameNumber))
+		error("proc1 failure");
+
+
 }
 
+bool MadsAnimation::proc1(SpriteAsset &spriteSet, const Common::Point &pt, int frameNumber) {
+	return 0;
+}
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/animation.h
===================================================================
--- scummvm/trunk/engines/m4/animation.h	2010-05-31 11:25:59 UTC (rev 49346)
+++ scummvm/trunk/engines/m4/animation.h	2010-05-31 12:10:30 UTC (rev 49347)
@@ -29,39 +29,90 @@
 #include "m4/m4.h"
 #include "m4/graphics.h"
 #include "m4/assets.h"
+#include "m4/mads_views.h"
+#include "common/array.h"
 
 namespace M4 {
 
-struct AnimationFrame {
-    uint16 animFrameIndex;
-    byte u;
-    byte seriesIndex;
-    uint16 seriesFrameIndex;
-    uint16 x, y;
-    byte v, w;
+class MadsView;
+class SpriteSlotSubset;
+
+class AnimMessage {
+public:
+	char msg[70];
+	Common::Point pos;
+	RGB8 rgb1, rgb2;
+	int kernelMsgIndex;
+
+	int startFrame, endFrame;
 };
 
-class Animation {
-    public:
-		Animation(MadsM4Engine *vm);
-        ~Animation();
+class AnimFrameEntry {
+public:
+	int frameNumber;
+	int seqIndex;
+	SpriteSlotSubset spriteSlot;
+};
 
-        void load(const char *filename);
-		void loadFullScreen(const char *filename);
-        void start();
-        bool updateAnim();
-        void stop();
+class AnimMiscEntry {
+public:
+	int soundNum;
+	int numTicks;
+	Common::Point posAdjust;
+};
 
-    private:
-		bool _playing;
-		MadsM4Engine *_vm;
-        int _seriesCount;
-        int _frameCount;
-        int _frameEntryCount;
-        AnimationFrame *_frameEntries;
-        Common::String *_spriteSeriesNames;
-        SpriteAsset *_spriteSeries;
-        int _curFrame, _curFrameEntry;
+#define ANIM_SPRITE_SET_SIZE 50
+
+enum MadsAnimationFlags {ANIM_CUSTOM_FONT = 0x20};
+
+class MadsAnimation: public Animation {
+private:
+	bool _playing;
+	MadsView *_view;
+
+	int _spriteListCount;
+	Common::Array<AnimMessage> _messages;
+	Common::Array<AnimFrameEntry> _frameEntries;
+	Common::Array<AnimMiscEntry> _miscEntries;
+	Font *_font;
+
+	uint8 _flags;
+	int _animMode;
+	int _roomNumber;
+	bool _field12;
+	int _spriteListIndex;
+	int _scrollX;
+	int _scrollY;
+	Common::String _field24;
+	Common::String _spriteSetNames[10];
+	Common::String _lbmFilename;
+	Common::String _spritesFilename;
+	Common::String _soundName;
+	Common::Array<int> _spriteListIndexes;
+
+    int _currentFrame, _oldFrameEntry;
+	bool _resetFlag;
+	int _unk1;
+	bool _skipLoad;
+	int _unkIndex;
+	Common::Point _unkList[2];
+	uint32 _nextFrameTimer;
+	int _messageCtr;
+	int _abortTimers;
+	AbortTimerMode _abortMode;
+	uint16 _actionNouns[3];
+
+	void load1(int frameNumber);
+	bool MadsAnimation::proc1(SpriteAsset &spriteSet, const Common::Point &pt, int frameNumber);
+public:
+	MadsAnimation(MadsM4Engine *vm, MadsView *view);
+    ~MadsAnimation();
+
+    virtual void load(const Common::String &filename);
+    virtual void start();
+    virtual bool update();
+    virtual void stop();
+	virtual void setCurrentFrame(int frameNumber);
 };
 
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/assets.cpp
===================================================================
--- scummvm/trunk/engines/m4/assets.cpp	2010-05-31 11:25:59 UTC (rev 49346)
+++ scummvm/trunk/engines/m4/assets.cpp	2010-05-31 12:10:30 UTC (rev 49347)
@@ -30,13 +30,13 @@
 
 namespace M4 {
 
-BaseAsset::BaseAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : _vm(vm) {
+BaseAsset::BaseAsset(MadsM4Engine *vm) : _vm(vm) {
 }
 
 BaseAsset::~BaseAsset() {
 }
 
-MachineAsset::MachineAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : BaseAsset(vm, stream, size, name) {
+MachineAsset::MachineAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : BaseAsset(vm) {
 	uint32 stateCount = stream->readUint32LE();
 	for (uint32 curState = 0; curState < stateCount; curState++) {
 		uint32 stateOffset = stream->readUint32LE();
@@ -61,7 +61,7 @@
 	return _stateTable[state];
 }
 
-SequenceAsset::SequenceAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : BaseAsset(vm, stream, size, name) {
+SequenceAsset::SequenceAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : BaseAsset(vm) {
 	_localVarCount = stream->readUint32LE();
 	_codeSize = size - 4;
 	_code = new byte[_codeSize];
@@ -78,7 +78,7 @@
 }
 
 
-DataAsset::DataAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : BaseAsset(vm, stream, size, name) {
+DataAsset::DataAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name) : BaseAsset(vm) {
 
 	_recCount = stream->readUint32LE();
 	_recSize = stream->readUint32LE();
@@ -98,7 +98,8 @@
 	return &_data[_recSize * index];
 }
 
-SpriteAsset::SpriteAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name, bool asStream) : BaseAsset(vm, stream, size, name) {
+SpriteAsset::SpriteAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name, bool asStream) : 
+			BaseAsset(vm) {
 	_stream = stream;
 	_palInterface = NULL;
 	_paletteData = NULL;
@@ -110,6 +111,20 @@
 	}
 }
 
+SpriteAsset::SpriteAsset(MadsM4Engine *vm, const char *name): BaseAsset(vm) {
+	_stream = vm->res()->get(name);
+	_palInterface = NULL;
+	_paletteData = NULL;
+
+	if (_vm->isM4()) {
+		loadM4SpriteAsset(vm, _stream, true);
+	} else {
+		loadMadsSpriteAsset(vm, _stream);
+	}
+
+	vm->res()->toss(name);
+}
+
 SpriteAsset::~SpriteAsset() {
 	if (_palInterface) {
 		// Internally stored palette translation data, so release it

Modified: scummvm/trunk/engines/m4/assets.h
===================================================================
--- scummvm/trunk/engines/m4/assets.h	2010-05-31 11:25:59 UTC (rev 49346)
+++ scummvm/trunk/engines/m4/assets.h	2010-05-31 12:10:30 UTC (rev 49347)
@@ -49,7 +49,7 @@
 
 class BaseAsset {
 public:
-	BaseAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name);
+	BaseAsset(MadsM4Engine *vm);
 	~BaseAsset();
 	const Common::String getName() const { return _name; }
 protected:
@@ -103,6 +103,7 @@
 class SpriteAsset : public BaseAsset {
 public:
 	SpriteAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, int size, const char *name, bool asStream = false);
+	SpriteAsset(MadsM4Engine *vm, const char *name);
 	~SpriteAsset();
 	void loadM4SpriteAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream, bool asStream);
 	void loadMadsSpriteAsset(MadsM4Engine *vm, Common::SeekableReadStream* stream);

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2010-05-31 11:25:59 UTC (rev 49346)
+++ scummvm/trunk/engines/m4/console.cpp	2010-05-31 12:10:30 UTC (rev 49347)
@@ -47,7 +47,6 @@
 	DCmd_Register("start_conv",		WRAP_METHOD(Console, cmdStartConversation));
 	DCmd_Register("textview",		WRAP_METHOD(Console, cmdShowTextview));
 	DCmd_Register("animview",		WRAP_METHOD(Console, cmdShowAnimview));
-	DCmd_Register("anim",			WRAP_METHOD(Console, cmdPlayAnimation));
 }
 
 Console::~Console() {
@@ -247,33 +246,6 @@
 	return false;
 }
 
-bool Console::cmdPlayAnimation(int argc, const char **argv) {
-	View *view = _vm->_viewManager->getView(VIEWID_SCENE);
-	if (view == NULL) {
-		DebugPrintf("The scene view isn't currently active\n");
-	} else if (argc != 2 && argc != 3) {
-		DebugPrintf("Usage: %s <anim resource (*.aa)> <fullscreen>\n", argv[0]);
-		DebugPrintf("If fullscreen is 1, the screen palette is replaced with the palette of the animation\n");
-	} else {
-		char resourceName[20];
-		strncpy(resourceName, argv[1], 15);
-		resourceName[15] = '\0';
-		if (!strchr(resourceName, '.'))
-			strcat(resourceName, ".AA");
-
-		_vm->_viewManager->moveToFront(view);
-		if (argc == 3 && atoi(argv[2]) == 1)
-			_vm->_animation->loadFullScreen(resourceName);
-		else
-			_vm->_animation->load(resourceName);
-		_vm->_animation->start();
-		view->restore(0, 0, view->width(), view->height());
-		return false;
-	}
-
-	return true;
-}
-
 /*--------------------------------------------------------------------------*/
 
 MadsConsole::MadsConsole(MadsEngine *vm): Console(vm) {
@@ -282,6 +254,7 @@
 	DCmd_Register("object",			WRAP_METHOD(MadsConsole, cmdObject));
 	DCmd_Register("message",		WRAP_METHOD(MadsConsole, cmdMessage));
 	DCmd_Register("scene_info",		WRAP_METHOD(MadsConsole, cmdSceneInfo));
+	DCmd_Register("anim",			WRAP_METHOD(MadsConsole, cmdPlayAnimation));
 }
 
 bool MadsConsole::cmdObject(int argc, const char **argv) {
@@ -386,6 +359,34 @@
 	return true;
 }
 
+bool MadsConsole::cmdPlayAnimation(int argc, const char **argv) {
+	View *view = _vm->_viewManager->getView(VIEWID_SCENE);
+	if (view == NULL) {
+		DebugPrintf("The scene view isn't currently active\n");
+	} else if (argc != 2 && argc != 3) {
+		DebugPrintf("Usage: %s <anim resource (*.aa)> <fullscreen>\n", argv[0]);
+		DebugPrintf("If fullscreen is 1, the screen palette is replaced with the palette of the animation\n");
+	} else {
+		char resourceName[20];
+		strncpy(resourceName, argv[1], 15);
+		resourceName[15] = '\0';
+		if (!strchr(resourceName, '.'))
+			strcat(resourceName, ".AA");
+
+		_vm->_viewManager->moveToFront(view);
+		if (argc == 3 && atoi(argv[2]) == 1)
+			_madsVm->scene()->_sceneAnimation.loadFullScreen(resourceName);
+		else
+			_madsVm->scene()->_sceneAnimation.load(resourceName);
+		_madsVm->scene()->_sceneAnimation.start();
+
+		view->restore(0, 0, view->width(), view->height());
+		return false;
+	}
+
+	return true;
+}
+
 /*--------------------------------------------------------------------------*/
 
 M4Console::M4Console(M4Engine *vm): Console(vm) {

Modified: scummvm/trunk/engines/m4/console.h
===================================================================
--- scummvm/trunk/engines/m4/console.h	2010-05-31 11:25:59 UTC (rev 49346)
+++ scummvm/trunk/engines/m4/console.h	2010-05-31 12:10:30 UTC (rev 49347)
@@ -50,7 +50,6 @@
 	bool cmdStartConversation(int argc, const char **argv);
 	bool cmdShowTextview(int argc, const char **argv);
 	bool cmdShowAnimview(int argc, const char **argv);
-	bool cmdPlayAnimation(int argc, const char **argv);
 
 public:
 	Console(MadsM4Engine *vm);
@@ -64,6 +63,8 @@
 	bool cmdObject(int argc, const char **argv);
 	bool cmdMessage(int argc, const char **argv);
 	bool cmdSceneInfo(int argc, const char **argv);
+	bool cmdPlayAnimation(int argc, const char **argv);
+
 public:
 	MadsConsole(MadsEngine *vm);
 	virtual ~MadsConsole() {}

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2010-05-31 11:25:59 UTC (rev 49346)
+++ scummvm/trunk/engines/m4/m4.cpp	2010-05-31 12:10:30 UTC (rev 49347)
@@ -145,7 +145,6 @@
 	delete _script;
 	delete _ws;
 	delete _random;
-	delete _animation;
 	delete _palette;
 }
 
@@ -184,7 +183,6 @@
 	_sound = new Sound(this, _mixer, 255);
 	_script = new ScriptInterpreter(this);
 	_ws = new WoodScript(this);
-	_animation = new Animation(this);
 	//_callbacks = new Callbacks(this);
 	_random = new Common::RandomSource();
 	g_eventRec.registerRandomSource(*_random, "m4");
@@ -581,8 +579,6 @@
 	while (!_events->quitFlag) {
 		eventHandler();
 
-		_animation->updateAnim();
-
 		if (g_system->getMillis() >= nextFrame) {
 			nextFrame = g_system->getMillis() + GAME_FRAME_DELAY;
 			++_currentTimer;

Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h	2010-05-31 11:25:59 UTC (rev 49346)
+++ scummvm/trunk/engines/m4/m4.h	2010-05-31 12:10:30 UTC (rev 49347)
@@ -200,7 +200,6 @@
 	Rails *_rails;
 	ScriptInterpreter *_script;
 	WoodScript *_ws;
-	Animation *_animation;
 	Common::RandomSource *_random;
 
 	Scene *scene() { return _scene; }

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-05-31 11:25:59 UTC (rev 49346)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-05-31 12:10:30 UTC (rev 49347)
@@ -24,6 +24,7 @@
  */
 
 #include "m4/m4_views.h"
+#include "m4/animation.h"
 #include "m4/dialogs.h"
 #include "m4/events.h"
 #include "m4/font.h"
@@ -43,6 +44,22 @@
 
 //--------------------------------------------------------------------------
 
+bool MadsSpriteSlot::operator==(const SpriteSlotSubset &other) const {
+	return (spriteListIndex == other.spriteListIndex) && (frameNumber == other.frameNumber) &&
+		(xp == other.xp) && (yp == other.yp) && (depth == other.depth) && (scale == other.scale);
+}
+
+void MadsSpriteSlot::copy(const SpriteSlotSubset &other) {
+	spriteListIndex = other.spriteListIndex;
+	frameNumber = other.frameNumber;
+	xp = other.xp;
+	yp = other.yp;
+	depth = other.depth;
+	scale = other.scale;
+}
+
+//--------------------------------------------------------------------------
+
 MadsSpriteSlots::MadsSpriteSlots(MadsView &owner): _owner(owner) {
 	for (int i = 0; i < SPRITE_SLOTS_SIZE; ++i) {
 		MadsSpriteSlot rec;
@@ -74,6 +91,7 @@
 	Common::SeekableReadStream *data = _vm->res()->get(resName);
 	SpriteAsset *spriteSet = new SpriteAsset(_vm, data, data->size(), resName);
 	spriteSet->translate(_madsVm->_palette);
+	assert(spriteSet != NULL);
 
 	_sprites.push_back(SpriteList::value_type(spriteSet));
 	_vm->res()->toss(resName);
@@ -1125,8 +1143,20 @@
 
 //--------------------------------------------------------------------------
 
+Animation::Animation(MadsM4Engine *vm): _vm(vm) {
+}
+
+void Animation::loadFullScreen(const Common::String &filename) {
+	_vm->_palette->deleteAllRanges();
+	load(filename);
+}
+
+//--------------------------------------------------------------------------
+
 MadsView::MadsView(View *view): _view(view), _dynamicHotspots(*this), _sequenceList(*this),
-		_kernelMessages(*this), _spriteSlots(*this), _dirtyAreas(*this), _textDisplay(*this) {
+		_kernelMessages(*this), _spriteSlots(*this), _dirtyAreas(*this), _textDisplay(*this),
+		// FIXME: There's probably a cleaner way to do this, and I don't think the destructor is ever called
+		_sceneAnimation(*new MadsAnimation(_vm, this)) {
 	_textSpacing = -1;
 	_ticksAmount = 3;
 	_newTimeout = 0;

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-05-31 11:25:59 UTC (rev 49346)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-05-31 12:10:30 UTC (rev 49347)
@@ -43,6 +43,16 @@
 
 enum AbortTimerMode {ABORTMODE_0 = 0, ABORTMODE_1 = 1, ABORTMODE_2 = 2};
 
+class SpriteSlotSubset {
+public:
+	int spriteListIndex;
+	int frameNumber;
+	int xp;
+	int yp;
+	int depth;
+	int scale;
+};
+
 class MadsSpriteSlot {
 public:
 	int spriteType;
@@ -55,12 +65,16 @@
 	int scale;
 
 	MadsSpriteSlot() { }
+
+	bool operator==(const SpriteSlotSubset &other) const;
+	void copy(const SpriteSlotSubset &other);
 };
 
 #define SPRITE_SLOTS_SIZE 50
 
 enum SpriteIdSpecial {
-	BACKGROUND_SPRITE = -4, FULL_SCREEN_REFRESH = -2, FOREGROUND_SPRITE = 1, EXPIRED_SPRITE = -1
+	BACKGROUND_SPRITE = -4, FULL_SCREEN_REFRESH = -2, EXPIRED_SPRITE = -1, SPRITE_ZERO = 0, FOREGROUND_SPRITE = 1,
+	SPRITE_FOUR = 4
 };
 
 typedef Common::Array<Common::SharedPtr<SpriteAsset> > SpriteList;
@@ -138,7 +152,7 @@
 };
 
 #define TIMED_TEXT_SIZE 10
-#define TEXT_4A_SIZE 30
+#define INDEFINITE_TIMEOUT 9999999
 
 enum KernelMessageFlags {KMSG_QUOTED = 1, KMSG_OWNER_TIMEOUT = 2, KMSG_SEQ_ENTRY = 4, KMSG_SCROLL = 8, KMSG_RIGHT_ALIGN = 0x10, 
 	KMSG_CENTER_ALIGN = 0x20, KMSG_EXPIRE = 0x40, KMSG_ACTIVE = 0x80};
@@ -352,10 +366,26 @@
 	void setAnimRange(int seqIndex, int startVal, int endVal);
 };
 
+class Animation {
+protected:
+	MadsM4Engine *_vm;
+public:
+	Animation(MadsM4Engine *vm);
+	void loadFullScreen(const Common::String &filename);
+
+	virtual void load(const Common::String &filename) = 0;
+    virtual void start() = 0;
+    virtual bool update() = 0;
+    virtual void stop() = 0;
+	virtual void setCurrentFrame(int frameNumber) = 0;
+};
+	
+
 class MadsView {
 private:
 	View *_view;
 public:
+	Animation &_sceneAnimation;
 	MadsSpriteSlots _spriteSlots;
 	MadsTextDisplay _textDisplay;
 	MadsKernelMessageList _kernelMessages;


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

Revision: 49350
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49350&view=rev
Author:   thebluegr
Date:     2010-05-31 12:27:13 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Hopefully fixed compilation

Modified Paths:
--------------
    scummvm/trunk/engines/m4/animation.cpp
    scummvm/trunk/engines/m4/animation.h

Modified: scummvm/trunk/engines/m4/animation.cpp
===================================================================
--- scummvm/trunk/engines/m4/animation.cpp	2010-05-31 12:13:50 UTC (rev 49349)
+++ scummvm/trunk/engines/m4/animation.cpp	2010-05-31 12:27:13 UTC (rev 49350)
@@ -106,7 +106,7 @@
 		// Chunk 2
 		// Following is a list of any messages for the animation
 
-		Common::SeekableReadStream *animStream = anim.getItemStream(streamIndex++);
+		animStream = anim.getItemStream(streamIndex++);
 
 		for (int i = 0; i < messagesCount; ++i) {
 			AnimMessage rec;

Modified: scummvm/trunk/engines/m4/animation.h
===================================================================
--- scummvm/trunk/engines/m4/animation.h	2010-05-31 12:13:50 UTC (rev 49349)
+++ scummvm/trunk/engines/m4/animation.h	2010-05-31 12:27:13 UTC (rev 49350)
@@ -103,10 +103,10 @@
 	uint16 _actionNouns[3];
 
 	void load1(int frameNumber);
-	bool MadsAnimation::proc1(SpriteAsset &spriteSet, const Common::Point &pt, int frameNumber);
+	bool proc1(SpriteAsset &spriteSet, const Common::Point &pt, int frameNumber);
 public:
 	MadsAnimation(MadsM4Engine *vm, MadsView *view);
-    ~MadsAnimation();
+    virtual ~MadsAnimation();
 
     virtual void load(const Common::String &filename);
     virtual void start();


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

Revision: 49352
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49352&view=rev
Author:   wjpalenstijn
Date:     2010-05-31 12:38:15 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Fix warning, whitespace

Modified Paths:
--------------
    scummvm/trunk/engines/m4/animation.h
    scummvm/trunk/engines/m4/compression.h
    scummvm/trunk/engines/m4/m4_views.cpp
    scummvm/trunk/engines/m4/mads_views.cpp
    scummvm/trunk/engines/m4/mads_views.h

Modified: scummvm/trunk/engines/m4/animation.h
===================================================================
--- scummvm/trunk/engines/m4/animation.h	2010-05-31 12:36:42 UTC (rev 49351)
+++ scummvm/trunk/engines/m4/animation.h	2010-05-31 12:38:15 UTC (rev 49352)
@@ -90,7 +90,7 @@
 	Common::String _soundName;
 	Common::Array<int> _spriteListIndexes;
 
-    int _currentFrame, _oldFrameEntry;
+	int _currentFrame, _oldFrameEntry;
 	bool _resetFlag;
 	int _unk1;
 	bool _skipLoad;
@@ -106,12 +106,12 @@
 	bool proc1(SpriteAsset &spriteSet, const Common::Point &pt, int frameNumber);
 public:
 	MadsAnimation(MadsM4Engine *vm, MadsView *view);
-    virtual ~MadsAnimation();
+	virtual ~MadsAnimation();
 
-    virtual void load(const Common::String &filename);
-    virtual void start();
-    virtual bool update();
-    virtual void stop();
+	virtual void load(const Common::String &filename);
+	virtual void start();
+	virtual bool update();
+	virtual void stop();
 	virtual void setCurrentFrame(int frameNumber);
 };
 

Modified: scummvm/trunk/engines/m4/compression.h
===================================================================
--- scummvm/trunk/engines/m4/compression.h	2010-05-31 12:36:42 UTC (rev 49351)
+++ scummvm/trunk/engines/m4/compression.h	2010-05-31 12:38:15 UTC (rev 49352)
@@ -66,8 +66,8 @@
 
 class FabDecompressor {
 private:
-    int _bitsLeft;
-    uint32 _bitBuffer;
+	int _bitsLeft;
+	uint32 _bitBuffer;
 	const byte *_srcData, *_srcP;
 	int _srcSize;
 

Modified: scummvm/trunk/engines/m4/m4_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_views.cpp	2010-05-31 12:36:42 UTC (rev 49351)
+++ scummvm/trunk/engines/m4/m4_views.cpp	2010-05-31 12:38:15 UTC (rev 49352)
@@ -34,7 +34,7 @@
 GUIInventory::GUIInventory(View *owner, MadsM4Engine *vm, const Common::Rect &bounds, int horizCells,
 		   int vertCells, int cellWidth, int cellHeight, int tag): GUIRect(owner, bounds, tag) {
 
-    _vm = vm;
+	_vm = vm;
 	_cellCount.x = horizCells;
 	_cellCount.y = vertCells;
 	_cellSize.x = cellWidth;

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-05-31 12:36:42 UTC (rev 49351)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-05-31 12:38:15 UTC (rev 49352)
@@ -1146,6 +1146,9 @@
 Animation::Animation(MadsM4Engine *vm): _vm(vm) {
 }
 
+Animation::~Animation() {
+}
+
 void Animation::loadFullScreen(const Common::String &filename) {
 	_vm->_palette->deleteAllRanges();
 	load(filename);

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-05-31 12:36:42 UTC (rev 49351)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-05-31 12:38:15 UTC (rev 49352)
@@ -371,12 +371,13 @@
 	MadsM4Engine *_vm;
 public:
 	Animation(MadsM4Engine *vm);
+	virtual ~Animation();
 	void loadFullScreen(const Common::String &filename);
 
 	virtual void load(const Common::String &filename) = 0;
-    virtual void start() = 0;
-    virtual bool update() = 0;
-    virtual void stop() = 0;
+	virtual void start() = 0;
+	virtual bool update() = 0;
+	virtual void stop() = 0;
 	virtual void setCurrentFrame(int frameNumber) = 0;
 };
 	


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

Revision: 49405
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49405&view=rev
Author:   dreammaster
Date:     2010-06-03 09:34:32 +0000 (Thu, 03 Jun 2010)

Log Message:
-----------
Moved the MADS interface view into mads_scene.cpp and did a major cleanup of scene loading code

Modified Paths:
--------------
    scummvm/trunk/engines/m4/animation.cpp
    scummvm/trunk/engines/m4/animation.h
    scummvm/trunk/engines/m4/console.cpp
    scummvm/trunk/engines/m4/graphics.cpp
    scummvm/trunk/engines/m4/graphics.h
    scummvm/trunk/engines/m4/mads_scene.cpp
    scummvm/trunk/engines/m4/mads_scene.h
    scummvm/trunk/engines/m4/mads_views.cpp
    scummvm/trunk/engines/m4/mads_views.h

Modified: scummvm/trunk/engines/m4/animation.cpp
===================================================================
--- scummvm/trunk/engines/m4/animation.cpp	2010-06-03 03:55:08 UTC (rev 49404)
+++ scummvm/trunk/engines/m4/animation.cpp	2010-06-03 09:34:32 UTC (rev 49405)
@@ -26,6 +26,7 @@
 #include "m4/assets.h"
 #include "m4/animation.h"
 #include "m4/compression.h"
+#include "m4/mads_scene.h"
 
 namespace M4 {
 
@@ -44,7 +45,7 @@
 	delete _font;
 }
 
-void MadsAnimation::load(const Common::String &filename) {
+void MadsAnimation::load(const Common::String &filename, uint16 flags, M4Surface *walkSurface, M4Surface *sceneSurface) {
 	MadsPack anim(filename.c_str(), _vm);
 	bool madsRes = filename[0] == '*';
 	char buffer[20];
@@ -64,7 +65,6 @@
 
 	animStream->skip(2);
 	_animMode = animStream->readUint16LE();
-	assert(_animMode != 4);
 	_roomNumber = animStream->readUint16LE();
 	_field12 = animStream->readUint16LE() != 0;
 	animStream->skip(4);
@@ -74,7 +74,7 @@
 	animStream->skip(10);
 	
 	animStream->read(buffer, 13);
-	_field24 = Common::String(buffer, 13);
+	_infoFilename = Common::String(buffer, 13);
 
 	for (int i = 0; i < 10; ++i) {
 		animStream->read(buffer, 13);
@@ -93,8 +93,10 @@
 	animStream->read(buffer, 13);
 	Common::String fontResource(buffer, 13);
 
-	// TODO: Based on a weird usage of a flags word, a secondary method gets called here.
-	// Figure out secondary method, and when/if it's called
+	if (_animMode == 4)
+		flags |= 0x4000;
+	if (flags & 0x100)
+		loadInterface(walkSurface, sceneSurface);
 
 	// Initialise the reference list
 	for (int i = 0; i < spriteListCount; ++i)
@@ -416,12 +418,24 @@
 
 	if (proc1(spriteSet, pt, frameNumber))
 		error("proc1 failure");
-
-
 }
 
 bool MadsAnimation::proc1(SpriteAsset &spriteSet, const Common::Point &pt, int frameNumber) {
 	return 0;
 }
 
+void MadsAnimation::loadInterface(M4Surface *walkSurface, M4Surface *sceneSurface) {
+	walkSurface->madsloadInterface(0);
+
+
+	/* TODO - implement properly
+	if (_animMode > 2) {
+		warning("Mode1");	
+	} else {
+		MadsSceneResources sceneResources;
+		sceneResources.load(_roomNumber, _infoFilename.c_str(), 0, walkSurface, sceneSurface);
+	}
+	*/
+}
+
 } // End of namespace M4

Modified: scummvm/trunk/engines/m4/animation.h
===================================================================
--- scummvm/trunk/engines/m4/animation.h	2010-06-03 03:55:08 UTC (rev 49404)
+++ scummvm/trunk/engines/m4/animation.h	2010-06-03 09:34:32 UTC (rev 49405)
@@ -83,7 +83,7 @@
 	int _spriteListIndex;
 	int _scrollX;
 	int _scrollY;
-	Common::String _field24;
+	Common::String _infoFilename;
 	Common::String _spriteSetNames[10];
 	Common::String _lbmFilename;
 	Common::String _spritesFilename;
@@ -104,11 +104,12 @@
 
 	void load1(int frameNumber);
 	bool proc1(SpriteAsset &spriteSet, const Common::Point &pt, int frameNumber);
+	void loadInterface(M4Surface *walkSurface, M4Surface *sceneSurface);
 public:
 	MadsAnimation(MadsM4Engine *vm, MadsView *view);
 	virtual ~MadsAnimation();
 
-	virtual void load(const Common::String &filename);
+	virtual void load(const Common::String &filename, uint16 flags, M4Surface *walkSurface, M4Surface *sceneSurface);
 	virtual void start();
 	virtual bool update();
 	virtual void stop();

Modified: scummvm/trunk/engines/m4/console.cpp
===================================================================
--- scummvm/trunk/engines/m4/console.cpp	2010-06-03 03:55:08 UTC (rev 49404)
+++ scummvm/trunk/engines/m4/console.cpp	2010-06-03 09:34:32 UTC (rev 49405)
@@ -375,11 +375,11 @@
 
 		_vm->_viewManager->moveToFront(view);
 		if (argc == 3 && atoi(argv[2]) == 1)
-			_madsVm->scene()->_sceneAnimation.loadFullScreen(resourceName);
-		else
-			_madsVm->scene()->_sceneAnimation.load(resourceName);
-		_madsVm->scene()->_sceneAnimation.start();
+			_madsVm->_palette->deleteAllRanges();
 
+		_madsVm->scene()->_sceneAnimation->load(resourceName, 0, NULL, NULL);
+		_madsVm->scene()->_sceneAnimation->start();
+
 		view->restore(0, 0, view->width(), view->height());
 		return false;
 	}

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2010-06-03 03:55:08 UTC (rev 49404)
+++ scummvm/trunk/engines/m4/graphics.cpp	2010-06-03 09:34:32 UTC (rev 49405)
@@ -69,6 +69,13 @@
 
 #define VGA_COLOR_TRANS(x) (x == 0x3f ? 255 : x << 2)
 
+M4Surface::~M4Surface() {
+	if (_rgbList) {
+		_madsVm->_palette->deleteRange(_rgbList);
+		delete _rgbList;
+	}
+}
+
 void M4Surface::loadCodesM4(Common::SeekableReadStream *source) {
 	if (!source) {
 		free();
@@ -472,9 +479,18 @@
 
 		if (_vm->getGameType() == GType_RexNebular) {
 			// Load Rex Nebular screen
+			bool hasPalette = palData != NULL;
+			if (!hasPalette)
+				palData = &_rgbList;
+
 			sprintf(resourceName, "rm%d.art", sceneNumber);
 			stream = _vm->_resourceManager->get(resourceName);
 			rexLoadBackground(stream, palData);
+
+			if (!hasPalette) {
+				_vm->_palette->addRange(_rgbList);
+				this->translate(_rgbList);
+			}
 		} else {
 			// Loads M4 game scene
 			if (palData)
@@ -717,6 +733,10 @@
 	MadsPack intFile(resourceName, _vm);
 	RGB8 *palette = new RGB8[16];
 
+	bool hasPalette = palData != NULL;
+	if (!hasPalette)
+		palData = &_rgbList;
+
 	// Chunk 0, palette
 	Common::SeekableReadStream *intStream = intFile.getItemStream(0);
 
@@ -736,6 +756,12 @@
 	create(320, 44, 1);
 	intStream->read(pixels, 320 * 44);
 	delete intStream;
+
+	if (!hasPalette) {
+		// Translate the interface palette
+		_vm->_palette->addRange(_rgbList);
+		this->translate(_rgbList);
+	}
 }
 
 void M4Surface::scrollX(int xAmount) {

Modified: scummvm/trunk/engines/m4/graphics.h
===================================================================
--- scummvm/trunk/engines/m4/graphics.h	2010-06-03 03:55:08 UTC (rev 49404)
+++ scummvm/trunk/engines/m4/graphics.h	2010-06-03 09:34:32 UTC (rev 49405)
@@ -35,6 +35,12 @@
 
 namespace M4 {
 
+#define MADS_SURFACE_WIDTH 320
+#define MADS_SURFACE_HEIGHT 156
+#define MADS_SCREEN_HEIGHT 200
+#define MADS_Y_OFFSET ((MADS_SCREEN_HEIGHT - MADS_SURFACE_HEIGHT) / 2)
+
+
 struct BGR8 {
 	uint8 b, g, r;
 };
@@ -89,19 +95,23 @@
 private:
 	byte _color;
 	bool _isScreen;
+	RGBList *_rgbList;
 
 	void rexLoadBackground(Common::SeekableReadStream *source, RGBList **palData = NULL);
 	void madsLoadBackground(int roomNumber, RGBList **palData = NULL);
 	void m4LoadBackground(Common::SeekableReadStream *source);
 public:
 	M4Surface(bool isScreen = false) {
-		create(g_system->getWidth(), g_system->getHeight(), 1);
+		create(g_system->getWidth(), isScreen ? g_system->getHeight() : MADS_SURFACE_HEIGHT, 1);
 		_isScreen = isScreen;
+		_rgbList = NULL;
 	}
 	M4Surface(int width_, int height_) {
 		create(width_, height_, 1);
 		_isScreen = false;
+		_rgbList = NULL;
 	}
+	virtual ~M4Surface();
 
 	// loads a .COD file into the M4Surface
 	// TODO: maybe move this to the rail system? check where it makes sense
@@ -112,7 +122,7 @@
 	// loads the specified background
 	void loadBackground(int sceneNumber, RGBList **palData = NULL);
 	void loadBackgroundRiddle(const char *sceneName);
-	void madsloadInterface(int index, RGBList **palData);
+	void madsloadInterface(int index, RGBList **palData = NULL);
 
 	void setColor(byte value) { _color = value; }
 	void setColour(byte value) { _color = value; }

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-06-03 03:55:08 UTC (rev 49404)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-06-03 09:34:32 UTC (rev 49405)
@@ -40,6 +40,13 @@
 
 namespace M4 {
 
+static const int INV_ANIM_FRAME_SPEED = 2;
+static const int INVENTORY_X = 160;
+static const int INVENTORY_Y = 159;
+static const int SCROLLER_DELAY = 200;
+
+//--------------------------------------------------------------------------
+
 MadsScene::MadsScene(MadsEngine *vm): _sceneResources(), Scene(vm, &_sceneResources), MadsView(this) {
 	_vm = vm;
 
@@ -66,10 +73,17 @@
 	_kernelMessages.clear();
 
 	// Load up the properties for the scene
-	_sceneResources.load(_currentScene);
+	_sceneResources.load(_currentScene, 0/*word_83546*/, NULL, _walkSurface, _backgroundSurface);
 
 	// Load scene walk paths
 	loadSceneCodes(_currentScene);
+
+	// Initialise the scene animation
+	uint16 flags = 0x4100;
+	if (_madsVm->globals()->_config.textWindowStill)
+		flags |= 0x200;
+
+	_sceneAnimation->load(aaName, flags, _interfaceSurface, NULL);
 }
 
 /**
@@ -83,23 +97,8 @@
 		{0x00<<2, 0x10<<2, 0x16<<2, 0}};
 	_vm->_palette->setPalette(&sysColors[0], 4, 3);
 
-	_backgroundSurface->loadBackground(_currentScene, &_palData);
-	_vm->_palette->addRange(_palData);
-	_backgroundSurface->translate(_palData);
+	_interfaceSurface->initialise();
 
-	if (_currentScene < 900) {
-		_interfaceSurface->madsloadInterface(0, &_interfacePal);
-		_vm->_palette->addRange(_interfacePal);
-		_interfaceSurface->translate(_interfacePal);
-		_backgroundSurface->copyFrom(_interfaceSurface, Common::Rect(0, 0, 320, 44), 0, 200 - 44);
-
-		_interfaceSurface->initialise();
-	}
-
-	// Don't load other screen resources for system screens
-	if (_currentScene >= 900)
-		return;
-
 	loadSceneHotspots(_currentScene);
 
 	_action.clear();
@@ -185,15 +184,6 @@
 		sceneS = walkData.getItemStream(0);
 		_walkSurface->loadCodesMads(sceneS);
 		_vm->res()->toss(filename);
-	} else if (_vm->getGameType() == GType_RexNebular) {
-		// For Rex Nebular, the walk areas are part of the scene info
-		byte *destP = _walkSurface->getBasePtr(0, 0);
-		const byte *srcP = _sceneResources.walkData;
-		byte runLength;
-		while ((runLength = *srcP++) != 0) {
-			Common::set_to(destP, destP + runLength, *srcP++);
-			destP += runLength;
-		}
 	}
 }
 
@@ -614,45 +604,531 @@
 
 /*--------------------------------------------------------------------------*/
 
-void MadsSceneResources::load(int sId) {
-	const char *sceneInfoStr = MADSResourceManager::getResourceName(RESPREFIX_RM, sId, ".DAT");
-	Common::SeekableReadStream *rawStream = _vm->_resourceManager->get(sceneInfoStr);
+void MadsSceneResources::load(int sceneId, const char *resName, int v0, M4Surface *depthSurface, M4Surface *surface) {
+	char buffer[80];
+	const char *sceneName;
+
+	// TODO: Initialise spriteSet / xp_list
+
+	if (sceneId > 0) {
+		sceneName = MADSResourceManager::getResourceName(RESPREFIX_RM, sceneId, ".DAT");
+	} else {
+		strcat(buffer, "*");
+		strcat(buffer, resName);
+		sceneName = buffer; // TODO: Check whether this needs to be converted to 'HAG form'
+	}
+
+	Common::SeekableReadStream *rawStream = _vm->_resourceManager->get(sceneName);
 	MadsPack sceneInfo(rawStream);
 
+	// Chunk 0:
 	// Basic scene info
 	Common::SeekableReadStream *stream = sceneInfo.getItemStream(0);
 
 	int resSceneId = stream->readUint16LE();
-	assert(resSceneId == sId);
-
+	assert(resSceneId == sceneId);
 	artFileNum = stream->readUint16LE();
-	field_4 = stream->readUint16LE();
+	dialogStyle = stream->readUint16LE();
 	width = stream->readUint16LE();
 	height = stream->readUint16LE();
 	assert((width == 320) && (height == 156));
 	
 	stream->skip(24);
 
-	objectCount = stream->readUint16LE();
+	int objectCount = stream->readUint16LE();
 
 	stream->skip(40);
 
+	// Load in any scene objects
 	for (int i = 0; i < objectCount; ++i) {
-		objects[i].load(stream);
+		MadsObject rec;
+		rec.load(stream);
+		objects.push_back(rec);
 	}
+	for (int i = 0; i < 20 - objectCount; ++i)
+		stream->skip(48);
 
+	int setCount = stream->readUint16LE();
+	stream->readUint16LE();
+	for (int i = 0; i < setCount; ++i) {
+		char buffer[64];
+		Common::String s(buffer, 64);
+		setNames.push_back(s);
+	}
+	
+	// Initialise a copy of the surfaces if they weren't provided
+	bool dsFlag = false, ssFlag = false;
+	int gfxSize = width * height;
+	if (!surface) {
+		surface = new M4Surface(width, height);
+		ssFlag = true;
+	}
+	int walkSize = gfxSize;
+	if (dialogStyle == 2) {
+		width >>= 2;
+		walkSize = width * height;
+	}
+	if (!depthSurface) {
+		depthSurface = new M4Surface(width, height);
+		dsFlag = true;
+	}
+
 	// For Rex Nebular, read in the scene's compressed walk surface information
 	if (_vm->getGameType() == GType_RexNebular) {
-		delete walkData;
-
+		assert(depthSurface);
 		stream = sceneInfo.getItemStream(1);
-		walkData = (byte *)malloc(stream->size());
+		byte *walkData = (byte *)malloc(stream->size());
 		stream->read(walkData, stream->size());
+
+		// For Rex Nebular, the walk areas are part of the scene info
+		byte *destP = depthSurface->getBasePtr(0, 0);
+		const byte *srcP = walkData;
+		byte runLength;
+		while ((runLength = *srcP++) != 0) {
+			Common::set_to(destP, destP + runLength, *srcP++);
+			destP += runLength;
+		}
+
+		delete walkData;
+		delete stream;
 	}
 
-	_vm->_resourceManager->toss(sceneInfoStr);
+	_vm->_resourceManager->toss(sceneName);
+
+	// Load the surface artwork
+	surface->loadBackground(sceneId);
+
+	// Final cleanup
+	if (ssFlag)
+		delete surface;
+	if (dsFlag)
+		delete depthSurface;
 }
 
+
 /*--------------------------------------------------------------------------*/
 
+/*--------------------------------------------------------------------------
+ * MadsInterfaceView handles the user interface section at the bottom of
+ * game screens in MADS games
+ *--------------------------------------------------------------------------
+ */
+
+MadsInterfaceView::MadsInterfaceView(MadsM4Engine *vm): GameInterfaceView(vm, 
+		Common::Rect(0, MADS_SURFACE_HEIGHT, vm->_screen->width(), vm->_screen->height())) {
+	_screenType = VIEWID_INTERFACE;
+	_highlightedElement = -1;
+	_topIndex = 0;
+	_selectedObject = -1;
+	_cheatKeyCtr = 0;
+
+	_objectSprites = NULL;
+	_objectPalData = NULL;
+
+	/* Set up the rect list for screen elements */
+	// Actions
+	for (int i = 0; i < 10; ++i)
+		_screenObjects.addRect((i / 5) * 32 + 1, (i % 5) * 8 + MADS_SURFACE_HEIGHT + 2,
+			((i / 5) + 1) * 32 + 3, ((i % 5) + 1) * 8 + MADS_SURFACE_HEIGHT + 2);
+
+	// Scroller elements (up arrow, scroller, down arrow)
+	_screenObjects.addRect(73, 160, 82, 167);
+	_screenObjects.addRect(73, 168, 82, 190);
+	_screenObjects.addRect(73, 191, 82, 198);
+
+	// Inventory object names
+	for (int i = 0; i < 5; ++i)
+		_screenObjects.addRect(89, 158 + i * 8, 160, 166 + i * 8);
+
+	// Full rectangle area for all vocab actions
+	for (int i = 0; i < 5; ++i)
+		_screenObjects.addRect(239, 158 + i * 8, 320, 166 + i * 8);
+}
+
+MadsInterfaceView::~MadsInterfaceView() {
+	delete _objectSprites;
+}
+
+void MadsInterfaceView::setFontMode(InterfaceFontMode newMode) {
+	switch (newMode) {
+	case ITEM_NORMAL:
+		_vm->_font->current()->setColours(4, 4, 0xff);
+		break;
+	case ITEM_HIGHLIGHTED:
+		_vm->_font->current()->setColours(5, 5, 0xff);
+		break;
+	case ITEM_SELECTED:
+		_vm->_font->current()->setColours(6, 6, 0xff);
+		break;
+	}
+}
+
+void MadsInterfaceView::initialise() {
+	// Build up the inventory list
+	_inventoryList.clear();
+
+	for (uint i = 0; i < _madsVm->globals()->getObjectsSize(); ++i) {
+		MadsObject *obj = _madsVm->globals()->getObject(i);
+		if (obj->roomNumber == PLAYER_INVENTORY)
+			_inventoryList.push_back(i);
+	}
+
+	// If the inventory has at least one object, select it
+	if (_inventoryList.size() > 0)
+		setSelectedObject(_inventoryList[0]);
+}
+
+void MadsInterfaceView::setSelectedObject(int objectNumber) {
+	char resName[80];
+
+	// Load inventory resource
+	if (_objectSprites) {
+		_vm->_palette->deleteRange(_objectPalData);
+		delete _objectSprites;
+	}
+
+	// Check to make sure the object is in the inventory, and also visible on-screen
+	int idx = _inventoryList.indexOf(objectNumber);
+	if (idx == -1) {
+		// Object wasn't found, so return
+		_selectedObject = -1;
+		return;
+	}
+
+	// Found the object
+	if (idx < _topIndex)
+		_topIndex = idx;
+	else if (idx >= (_topIndex + 5))
+		_topIndex = MAX(0, idx - 4);
+
+	_selectedObject = objectNumber;
+	sprintf(resName, "*OB%.3dI.SS", objectNumber);
+
+	Common::SeekableReadStream *data = _vm->res()->get(resName);
+	_objectSprites = new SpriteAsset(_vm, data, data->size(), resName);
+	_vm->res()->toss(resName);
+
+	// Slot it into available palette space
+	_objectPalData = _objectSprites->getRgbList();
+	_vm->_palette->addRange(_objectPalData);
+	_objectSprites->translate(_objectPalData, true);
+
+	_objectFrameNumber = 0;
+}
+
+void MadsInterfaceView::addObjectToInventory(int objectNumber) {
+	if (_inventoryList.indexOf(objectNumber) == -1) {
+		_madsVm->globals()->getObject(objectNumber)->roomNumber = PLAYER_INVENTORY;
+		_inventoryList.push_back(objectNumber);
+	}
+
+	setSelectedObject(objectNumber);
+}
+
+void MadsInterfaceView::onRefresh(RectList *rects, M4Surface *destSurface) {
+	_vm->_font->setFont(FONT_INTERFACE_MADS);
+	char buffer[100];
+
+	// Check to see if any dialog is currently active
+	bool dialogVisible = _vm->_viewManager->getView(LAYER_DIALOG) != NULL;
+
+	// Highlighting logic for action list
+	int actionIndex = 0;
+	for (int x = 0; x < 2; ++x) {
+		for (int y = 0; y < 5; ++y, ++actionIndex) {
+			// Determine the font colour depending on whether an item is selected. Note that the first action,
+			// 'Look', is always 'selected', even when another action is clicked on
+			setFontMode((_highlightedElement == actionIndex) ? ITEM_HIGHLIGHTED :
+				((actionIndex == 0) ? ITEM_SELECTED : ITEM_NORMAL));
+
+			// Get the verb action and capitalise it
+			const char *verbStr = _madsVm->globals()->getVocab(kVerbLook + actionIndex);
+			strcpy(buffer, verbStr);
+			if ((buffer[0] >= 'a') && (buffer[0] <= 'z')) buffer[0] -= 'a' - 'A';
+
+			// Display the verb
+			const Common::Rect r(_screenObjects[actionIndex]);
+			_vm->_font->current()->writeString(destSurface, buffer, r.left, r.top, r.width(), 0);
+		}
+	}
+
+	// Check for highlighting of the scrollbar controls
+	if ((_highlightedElement == SCROLL_UP) || (_highlightedElement == SCROLL_SCROLLER) || (_highlightedElement == SCROLL_DOWN)) {
+		// Highlight the control's borders
+		const Common::Rect r(_screenObjects[_highlightedElement]);
+		destSurface->frameRect(r, 5);
+	}
+
+	// Draw the horizontal line in the scroller representing the current top selected
+	const Common::Rect scroller(_screenObjects[SCROLL_SCROLLER]);
+	int yP = (_inventoryList.size() < 2) ? 0 : (scroller.height() - 5) * _topIndex / (_inventoryList.size() - 1);
+	destSurface->setColor(4);
+	destSurface->hLine(scroller.left + 2, scroller.right - 3, scroller.top + 2 + yP);
+
+	// List inventory items
+	for (uint i = 0; i < 5; ++i) {
+		if ((_topIndex + i) >= _inventoryList.size())
+			break;
+
+		const char *descStr = _madsVm->globals()->getVocab(_madsVm->globals()->getObject(
+			_inventoryList[_topIndex + i])->d