[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.69,1.70 resource.cpp,1.90,1.91 scumm.h,1.171,1.172 verbs.cpp,1.27,1.28
James Brown
ender at users.sourceforge.net
Thu Jun 27 03:41:03 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm readme.txt,1.64,1.65
- Next message: [Scummvm-cvs-logs] CVS: scummvm akos.cpp,1.22,1.23 gfx.cpp,1.96,1.97 gfx.h,1.9,1.10 gui.cpp,1.49,1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv25566
Modified Files:
gameDetector.cpp resource.cpp scumm.h verbs.cpp
Log Message:
Basic putt-putt game support.
Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- gameDetector.cpp 18 Jun 2002 01:23:24 -0000 1.69
+++ gameDetector.cpp 27 Jun 2002 10:40:36 -0000 1.70
@@ -404,7 +404,12 @@
{"samnmax", "Sam & Max", GID_SAMNMAX, 6, 4, 2,
GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_DRAWOBJ_OTHER_ORDER},
{"snmdemo", "Sam & Max (Demo)", GID_SAMNMAX, 6, 3, 0,
- GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT},
+ GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT},
+
+ {"puttdemo", "Putt Putt joins the parade (demo)", GID_SAMNMAX, 6, 3, 0,
+ GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS},
+ {"moondemo", "Putt Putt goes to the moon (demo)", GID_SAMNMAX, 6, 3, 0,
+ GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS},
/* Scumm Version 7 */
{"ft", "Full Throttle", GID_FT, 7, 3, 0,
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- resource.cpp 25 Jun 2002 12:43:14 -0000 1.90
+++ resource.cpp 27 Jun 2002 10:40:36 -0000 1.91
@@ -64,12 +64,17 @@
return;
}
if (!(_features & GF_SMALL_HEADER)) {
+
if (_features & GF_AFTER_V7)
sprintf(buf, "%s%s.la%d", _gameDataPath, _exe_name,
room == 0 ? 0 : res.roomno[rtRoom][room]);
+ else if (_features & GF_HUMONGOUS)
+ sprintf(buf, "%s%s.he%.1d", _gameDataPath, _exe_name,
+ room == 0 ? 0 : res.roomno[rtRoom][room]);
else
sprintf(buf, "%s%s.%.3d", _gameDataPath, _exe_name,
room == 0 ? 0 : res.roomno[rtRoom][room]);
+
_encbyte = (_features & GF_USE_KEY) ? 0x69 : 0;
} else if (!(_features & GF_SMALL_NAMES)) {
if (room == 0 || room >= 900) {
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- scumm.h 4 Jun 2002 23:32:53 -0000 1.171
+++ scumm.h 27 Jun 2002 10:40:37 -0000 1.172
@@ -479,7 +479,8 @@
GF_AUDIOTRACKS = 1024,
GF_NO_SCALLING = 2048,
GF_ADLIB_DEFAULT = 4096,
- GF_AMIGA = 8192
+ GF_AMIGA = 8192,
+ GF_HUMONGOUS = 16384
};
enum WhereIsObject {
Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/verbs.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- verbs.cpp 20 May 2002 14:43:22 -0000 1.27
+++ verbs.cpp 27 Jun 2002 10:40:37 -0000 1.28
@@ -150,6 +150,8 @@
*/
_messagePtr = getResourceAddress(rtVerb, vrb);
+ if (!_messagePtr)
+ return;
assert(_messagePtr);
tmp = charset._center;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm readme.txt,1.64,1.65
- Next message: [Scummvm-cvs-logs] CVS: scummvm akos.cpp,1.22,1.23 gfx.cpp,1.96,1.97 gfx.h,1.9,1.10 gui.cpp,1.49,1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list