[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.123,1.124 script_v2.cpp,2.172,2.173 scummvm.cpp,2.345,2.346

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv2534/scumm

Modified Files:
	script.cpp script_v2.cpp scummvm.cpp 
Log Message:

Fix text display in verb/inventory area in demo mode of V1 maniac mansion


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- script.cpp	11 Aug 2003 02:31:03 -0000	1.123
+++ script.cpp	17 Aug 2003 07:02:32 -0000	1.124
@@ -657,6 +657,11 @@
 }
 
 void Scumm::runInventoryScript(int i) {
+	// FIXME demo mode in V1 Maniac Mansion shows quotes in this area
+	// during the introduction
+	if (_gameId == GID_MANIAC && _version == 1 && _demo_mode)
+		return;
+
 	if (_version <= 2) {
 		redrawV2Inventory();
 	} else {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.172
retrieving revision 2.173
diff -u -d -r2.172 -r2.173
--- script_v2.cpp	16 Aug 2003 10:37:26 -0000	2.172
+++ script_v2.cpp	17 Aug 2003 07:02:32 -0000	2.173
@@ -840,7 +840,10 @@
 		vs = &_verbs[slot];
 		vs->verbid = verb;
 		if (_version == 1) {
-			vs->color = 5;
+			if (_demo_mode)
+				vs->color = 4;
+			else
+				vs->color = 5;
 			vs->hicolor = 7;
 			vs->dimcolor = 11;
 		} else {
@@ -1311,8 +1314,12 @@
 	
 	VAR(VAR_CURSORSTATE) = 200;
 	
+	// FIXME demo mode in V1 Maniac Mansion shows quotes in this area
+	// during the introduction
+	if (!(_gameId == GID_MANIAC && _version == 1 && _demo_mode)) {
 	// Hide inventory, freeze scripts, hide cursor
 	setUserState(15);
+	}
 	
 	_sentenceNum = 0;
 	stopScript(SENTENCE_SCRIPT);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.345
retrieving revision 2.346
diff -u -d -r2.345 -r2.346
--- scummvm.cpp	17 Aug 2003 02:34:34 -0000	2.345
+++ scummvm.cpp	17 Aug 2003 07:02:33 -0000	2.346
@@ -63,6 +63,7 @@
 
 extern NewGui *g_gui;
 extern uint16 _debugLevel;
+extern uint16 _demo_mode;
 
 static const VersionSettings scumm_settings[] = {
 	/* Scumm Version 1 */