[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.453.2.1,1.453.2.2 scumm.cpp,1.603.2.3,1.603.2.4 scumm.h,1.647.2.1,1.647.2.2

kirben kirben at users.sourceforge.net
Thu Oct 20 07:45:30 CEST 2005


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

Modified Files:
      Tag: branch-0-8-0
	script_v6.cpp scumm.cpp scumm.h 
Log Message:

Correct version of early puttputt


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.453.2.1
retrieving revision 1.453.2.2
diff -u -d -r1.453.2.1 -r1.453.2.2
--- script_v6.cpp	18 Oct 2005 02:11:21 -0000	1.453.2.1
+++ script_v6.cpp	20 Oct 2005 14:44:52 -0000	1.453.2.2
@@ -1087,7 +1087,7 @@
 	// In Fatty Bear's Birthday Surprise the piano uses offsets 1 - 23 to
 	// indicate which note to play, but only when using the standard piano
 	// sound. See also o60_soundOps()
-	if (_heversion >= 61)
+	if (_heversion >= 61 && (_gameId != GID_PUTTDEMO))
 		offset = pop();
 
 #ifndef DISABLE_SCUMM_7_8

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.603.2.3
retrieving revision 1.603.2.4
diff -u -d -r1.603.2.3 -r1.603.2.4
--- scumm.cpp	20 Oct 2005 00:10:24 -0000	1.603.2.3
+++ scumm.cpp	20 Oct 2005 14:44:52 -0000	1.603.2.4
@@ -531,7 +531,7 @@
 	{"9c143c5905055d5df7a0f014ab379aee", "Putt-Putt Goes To The Moon (Windows Demo)", GID_HEGAME, 6, 70, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 
-	{"0b3222aaa7efcf283eb621e0cefd26cc", "Putt-Putt Joins The Parade (early version)", GID_HEGAME, 6, 61, MDT_ADLIB | MDT_NATIVE,
+	{"0b3222aaa7efcf283eb621e0cefd26cc", "Putt-Putt Joins The Parade (early version)", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE,
 	 GF_USE_KEY, Common::kPlatformWindows},
 	{"6a30a07f353a75cdc602db27d73e1b42", "Putt-Putt Joins The Parade (Windows)", GID_HEGAME, 6, 70, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.647.2.1
retrieving revision 1.647.2.2
diff -u -d -r1.647.2.1 -r1.647.2.2
--- scumm.h	18 Oct 2005 02:11:25 -0000	1.647.2.1
+++ scumm.h	20 Oct 2005 14:44:52 -0000	1.647.2.2
@@ -238,6 +238,7 @@
 	GID_FUNPACK,
 	GID_FREDDI2,
 	GID_FREDDICOVE,
+	GID_PUTTDEMO,
 	GID_PUTTRACE,
 	GID_FUNSHOP,	// Used for all three funshops
 	GID_FOOTBALL





More information about the Scummvm-git-logs mailing list