[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.454,1.455 scumm.cpp,1.606,1.607 scumm.h,1.649,1.650
kirben
kirben at users.sourceforge.net
Thu Oct 20 07:45:23 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse_player.cpp,2.58.2.1,2.58.2.2 sound.cpp,1.479.2.1,1.479.2.2
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22566/scumm
Modified Files:
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.454
retrieving revision 1.455
diff -u -d -r1.454 -r1.455
--- script_v6.cpp 18 Oct 2005 01:30:21 -0000 1.454
+++ script_v6.cpp 20 Oct 2005 14:44:02 -0000 1.455
@@ -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.606
retrieving revision 1.607
diff -u -d -r1.606 -r1.607
--- scumm.cpp 20 Oct 2005 00:11:35 -0000 1.606
+++ scumm.cpp 20 Oct 2005 14:44:02 -0000 1.607
@@ -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.649
retrieving revision 1.650
diff -u -d -r1.649 -r1.650
--- scumm.h 18 Oct 2005 01:30:21 -0000 1.649
+++ scumm.h 20 Oct 2005 14:44:03 -0000 1.650
@@ -213,6 +213,7 @@
GID_FUNPACK,
GID_FREDDI2,
GID_FREDDICOVE,
+ GID_PUTTDEMO,
GID_PUTTRACE,
GID_FUNSHOP, // Used for all three funshops
GID_FOOTBALL
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse_player.cpp,2.58.2.1,2.58.2.2 sound.cpp,1.479.2.1,1.479.2.2
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list