[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.186,1.187 script_v6.cpp,1.287,1.288 scummvm.cpp,2.567,2.568
Eugene Sandulenko
sev at users.sourceforge.net
Fri Feb 6 13:13:04 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.286,1.287
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.16,1.17 insane.h,1.10,1.11 insane_iact.cpp,1.11,1.12 insane_scenes.cpp,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10022/scumm
Modified Files:
resource.cpp script_v6.cpp scummvm.cpp
Log Message:
o Now Long TRS messages get wrapped
o Approaching enemy animation fixed
o Renames some vars and struct members
o Fixed dosdemo. It didn't run
o Correct Mac demo INSANE skipping behaviour
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- resource.cpp 5 Feb 2004 22:39:13 -0000 1.186
+++ resource.cpp 6 Feb 2004 21:05:57 -0000 1.187
@@ -2040,7 +2040,8 @@
_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
- if ((_gameId == GID_FT) && (_features & GF_DEMO))
+ if ((_gameId == GID_FT) && (_features & GF_DEMO) &&
+ (_features & GF_PC))
_numGlobalScripts = 300;
else
_numGlobalScripts = 2000;
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -r1.287 -r1.288
--- script_v6.cpp 6 Feb 2004 16:19:43 -0000 1.287
+++ script_v6.cpp 6 Feb 2004 21:05:57 -0000 1.288
@@ -2557,21 +2557,19 @@
debug(1, "INSANE Arg: %d %d", args[1], args[2]);
- SmushPlayer *sp = new SmushPlayer(this, speed);
-
// INSANE mode 0: SMUSH movie playback
if (args[1] == 0) {
+ SmushPlayer *sp = new SmushPlayer(this, speed);
+
sp->play((char *)getStringAddressVar(VAR_VIDEONAME), getGameDataPath());
+ delete sp;
} else if (_gameId == GID_FT) {
- const int insaneVarNum = (_features & GF_DEMO) ? 232 : 233;
+ const int insaneVarNum = ((_features & GF_DEMO) && (_features & GF_PC))
+ ? 232 : 233;
- // PC demo uses different INSANE
- if (!(_features & GF_DEMO)) {
- _insane->setSmushParams(speed);
- _insane->runScene(insaneVarNum);
- }
+ _insane->setSmushParams(speed);
+ _insane->runScene(insaneVarNum);
}
- delete sp;
}
break;
case 12:
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.567
retrieving revision 2.568
diff -u -d -r2.567 -r2.568
--- scummvm.cpp 6 Feb 2004 14:37:55 -0000 2.567
+++ scummvm.cpp 6 Feb 2004 21:05:57 -0000 2.568
@@ -190,7 +190,7 @@
{"ft", "Full Throttle", GID_FT, 7, MDT_NONE,
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE, 0},
{"ftdemo", "Full Throttle (Mac. Demo)", GID_FT, 7, MDT_NONE,
- GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE, 0},
+ GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEMO, 0},
{"ftpcdemo", "Full Throttle (PC Demo)", GID_FT, 7, MDT_NONE,
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEMO, "ft"},
@@ -644,6 +644,8 @@
if (_features & GF_AFTER_HEV7) {
sprintf(buf, "%s.he0", _gameName.c_str());
+ } else if ((_gameId == GID_FT) && (_features & GF_PC) && (_features & GF_DEMO)) {
+ sprintf(buf, "%s.000", _gameName.c_str());
} else if (_version >= 7) {
sprintf(buf, "%s.la0", _gameName.c_str());
} else if (_features & GF_HUMONGOUS)
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.286,1.287
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.16,1.17 insane.h,1.10,1.11 insane_iact.cpp,1.11,1.12 insane_scenes.cpp,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list