[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.213,1.214 scumm.h,1.326,1.327 scummvm.cpp,2.482,2.483

Jonathan Gray khalek at users.sourceforge.net
Tue Nov 18 02:18:13 CET 2003


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

Modified Files:
	script_v6.cpp scumm.h scummvm.cpp 
Log Message:
revert use of GF_DEMO in Humongous games fixing several problems

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- script_v6.cpp	18 Nov 2003 04:05:06 -0000	1.213
+++ script_v6.cpp	18 Nov 2003 10:16:47 -0000	1.214
@@ -927,7 +927,7 @@
 }
 
 void ScummEngine_v6::o6_startSound() {
-	if ((_features & GF_HUMONGOUS) && (_gameId != GID_PUTTPUTT) && (!(_features & GF_DEMO)))
+	if ((_features & GF_HUMONGOUS) && (_gameId != GID_PUTTDEMO))
 		pop(); // offset which seems to always be zero
 	_sound->addSoundToQueue(pop());
 }

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -d -r1.326 -r1.327
--- scumm.h	18 Nov 2003 09:44:58 -0000	1.326
+++ scumm.h	18 Nov 2003 10:16:49 -0000	1.327
@@ -189,6 +189,7 @@
 	GID_MANIAC,
 	GID_ZAK,
 	GID_PUTTPUTT,
+	GID_PUTTDEMO,
 	GID_PJSDEMO,
 	GID_MONKEY_SEGA
 };

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.482
retrieving revision 2.483
diff -u -d -r2.482 -r2.483
--- scummvm.cpp	18 Nov 2003 09:44:58 -0000	2.482
+++ scummvm.cpp	18 Nov 2003 10:16:49 -0000	2.483
@@ -152,8 +152,8 @@
 	/* Scumm Version 6 */
 	{"puttputt", "Putt-Putt Joins The Parade (DOS)", GID_PUTTPUTT, 6, MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES},
-	{"puttdemo", "Putt-Putt Joins The Parade (DOS Demo)", GID_PUTTPUTT, 6, MDT_ADLIB | MDT_NATIVE,
-	 GF_DEMO | GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS},
+	{"puttdemo", "Putt-Putt Joins The Parade (DOS Demo)", GID_PUTTDEMO, 6, MDT_ADLIB | MDT_NATIVE,
+	  GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS},
 	{"moondemo", "Putt-Putt Goes To The Moon (DOS Demo)", GID_PUTTPUTT, 6, MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES},
 	{"puttmoon", "Putt-Putt Goes To The Moon (DOS)", GID_PUTTPUTT, 6, MDT_ADLIB | MDT_NATIVE,





More information about the Scummvm-git-logs mailing list