[Scummvm-cvs-logs] CVS: scummvm/scumm script_v7he.cpp,2.171,2.172 script_v72he.cpp,2.316,2.317

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31748/scumm

Modified Files:
	script_v7he.cpp script_v72he.cpp 
Log Message:

The 'TextOn' ini setting is checked by earlier HE games too.


Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.171
retrieving revision 2.172
diff -u -d -r2.171 -r2.172
--- script_v7he.cpp	16 Nov 2005 05:41:13 -0000	2.171
+++ script_v7he.cpp	16 Nov 2005 06:51:02 -0000	2.172
@@ -952,10 +952,13 @@
 	type = pop();
 	switch (type) {
 	case 1: // number
-		if (!strcmp((char *)option, "NoPrinting"))
+		if (!strcmp((char *)option, "NoPrinting")) {
 			push(1);
-		else
+		} else if (!strcmp((char *)option, "TextOn")) {
+			push(ConfMan.getBool("subtitles"));
+		} else {
 			push(ConfMan.getInt((char *)option));
+		}
 		break;
 	case 2: // string
 		entry = (ConfMan.get((char *)option).c_str());
@@ -970,6 +973,7 @@
 	default:
 		error("o70_readINI: default type %d", type);
 	}
+	debug(0, "o70_readINI: Option %s", option);
 }
 
 void ScummEngine_v70he::o70_writeINI() {
@@ -987,12 +991,14 @@
 	switch (type) {
 	case 1: // number
 		ConfMan.set((char *)option, value);
+		debug(0, "o70_writeINI: Option %s Value %d", option, value);
 		break;
 	case 2: // string
 		convertMessageToString(_scriptPointer, string, sizeof(string));
 		len = resStrLen(_scriptPointer);
 		_scriptPointer += len + 1;
 		ConfMan.set((char *)option, (char *)string);
+		debug(0, "o70_writeINI: Option %s String %s", option, string);
 		break;
 	default:
 		error("o70_writeINI: default type %d", type);

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.316
retrieving revision 2.317
diff -u -d -r2.316 -r2.317
--- script_v72he.cpp	16 Nov 2005 05:08:11 -0000	2.316
+++ script_v72he.cpp	16 Nov 2005 06:51:02 -0000	2.317
@@ -2208,7 +2208,7 @@
 			return;
 
 		ConfMan.set((char *)option, (char *)string);
-		debug(0, "o72_writeINI: Option %s String %s", option);
+		debug(0, "o72_writeINI: Option %s String %s", option, string);
 		break;
 	default:
 		error("o72_writeINI: default type %d", type);