[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.215,1.216 scumm.h,1.585,1.586

[kirben]

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

Modified Files:
	script.cpp scumm.h 
Log Message:

Correction to last commits.


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- script.cpp	20 Apr 2005 01:33:42 -0000	1.215
+++ script.cpp	20 Apr 2005 01:42:55 -0000	1.216
@@ -360,7 +360,7 @@
 void ScummEngine::nukeArrays(byte scriptSlot) {
 	int i;
 
-	if (_heversion < 60 || scriptSlot == 0)
+	if (_heversion == 0 || scriptSlot == 0)
 		return;
 
 	for (i = 1; i < _numArray; i++) {
@@ -584,7 +584,7 @@
 		// stay in sync with loom cd subtitle var
 		if ((_gameId == GID_LOOM256 || _heversion >= 60) && var == VAR_NOSUBTITLES) {
 			assert(value == 0 || value == 1);
-			if (_heversion == 60 && vm.slot[_currentScript].number == 1)
+			if (_heversion <= 61 && vm.slot[_currentScript].number == 1)
 				value = !ConfMan.getBool("subtitles");
 			else
 				ConfMan.set("subtitles", (value == 0));

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -d -r1.585 -r1.586
--- scumm.h	20 Apr 2005 01:38:48 -0000	1.585
+++ scumm.h	20 Apr 2005 01:42:55 -0000	1.586
@@ -115,7 +115,6 @@
 	GF_FEW_LOCALS          = 1 << 13,
 
 	/** Games made by Humongous Entertainment. */
-	GF_HUMONGOUS           = 1 << 14,
 	GF_MULTIPLE_VERSIONS   = 1 << 15,
 	
 	GF_FMTOWNS             = 1 << 17,