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

[dreammaster at users.sourceforge.net]

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.