[Scummvm-cvs-logs] CVS: scummvm/scumm help.cpp,1.12,1.13 imuse_digi.cpp,1.56,1.57 resource.cpp,1.173,1.174 script_v6.cpp,1.211,1.212 scumm.h,1.324,1.325 scummvm.cpp,2.479,2.480 string.cpp,1.169,1.170
Pawel Kolodziejski
aquadran at users.sourceforge.net
Mon Nov 17 13:18:06 CET 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv8000
Modified Files:
help.cpp imuse_digi.cpp resource.cpp script_v6.cpp scumm.h
scummvm.cpp string.cpp
Log Message:
replaced demo GIDs wth GF_DEMO
Index: help.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/help.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- help.cpp 13 Nov 2003 10:51:01 -0000 1.12
+++ help.cpp 17 Nov 2003 21:16:43 -0000 1.13
@@ -47,7 +47,6 @@
case GID_DIG:
case GID_FT:
case GID_CMI:
- case GID_FTDEMO:
return 3;
break;
/* TODO - I don't know the controls for these games
@@ -216,7 +215,6 @@
ADD_BIND("b", "Black and White / Color");
break;
case GID_FT:
- case GID_FTDEMO:
ADD_BIND("e", "Eyes");
ADD_BIND("t", "Tongue");
ADD_BIND("i", "Inventory");
Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- imuse_digi.cpp 17 Nov 2003 18:59:25 -0000 1.56
+++ imuse_digi.cpp 17 Nov 2003 21:16:43 -0000 1.57
@@ -1047,7 +1047,7 @@
return 0;
}
}
- } else if (_scumm->_gameId == GID_CMIDEMO) {
+ } else if ((_scumm->_gameId == GID_CMI) && (_scumm->_features & GF_DEMO)) {
if (b == 1000) { // STATE_NULL
_scumm->_sound->stopBundleMusic();
return 0;
@@ -1082,7 +1082,7 @@
return 0;
}
}
- } else if (_scumm->_gameId == GID_FT || _scumm->_gameId == GID_FTDEMO) {
+ } else if (_scumm->_gameId == GID_FT) {
for (l = 0;; l++) {
if (_ftStateMusicTable[l].index == -1) {
return 1;
@@ -1129,7 +1129,7 @@
return 0;
}
}
- } else if (_scumm->_gameId == GID_FT || _scumm->_gameId == GID_FTDEMO) {
+ } else if (_scumm->_gameId == GID_FT) {
for (l = 0;; l++) {
if (_ftSeqMusicTable[l].index == -1) {
return 1;
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- resource.cpp 13 Nov 2003 10:51:02 -0000 1.173
+++ resource.cpp 17 Nov 2003 21:16:43 -0000 1.174
@@ -90,8 +90,12 @@
// FIXME: Now it is not possible to have target file and
// main resource file named differently
- if (_gameId == GID_FTDEMO)
+ if ((_gameId == GID_FT) && (_features & GF_DEMO))
sprintf(buf2, "ft.%.3d", room == 0 ? 0 : res.roomno[rtRoom][room]);
+ else if ((_gameId == GID_DIG) && (_features & GF_DEMO))
+ sprintf(buf2, "dig.la%d", room == 0 ? 0 : res.roomno[rtRoom][room]);
+ else if ((_gameId == GID_CMI) && (_features & GF_DEMO))
+ sprintf(buf2, "comi.la%d", room == 0 ? 0 : res.roomno[rtRoom][room]);
else
sprintf(buf2, "%s.%.3d", _gameName.c_str(), room == 0 ? 0 : res.roomno[rtRoom][room]);
} else if (_features & GF_HUMONGOUS)
@@ -2076,7 +2080,7 @@
_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
- if (_gameId == GID_FTDEMO)
+ if ((_gameId == GID_FT) && (_features & GF_DEMO))
_numGlobalScripts = 300;
else
_numGlobalScripts = 2000;
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- script_v6.cpp 16 Nov 2003 20:52:56 -0000 1.211
+++ script_v6.cpp 17 Nov 2003 21:16:43 -0000 1.212
@@ -927,7 +927,7 @@
}
void ScummEngine_v6::o6_startSound() {
- if ((_features & GF_HUMONGOUS) && (_gameId != GID_PUTTDEMO))
+ if ((_features & GF_HUMONGOUS) && (_gameId != GID_PUTTPUTT) && (!(_features & GF_DEMO)))
pop(); // offset which seems to always be zero
_sound->addSoundToQueue(pop());
}
@@ -1814,7 +1814,7 @@
// Full Throttle implements conversation by creating new verbs, one
// for each option, but it never tells when to actually draw them.
- if (_gameId == GID_FT || _gameId == GID_FTDEMO)
+ if (_gameId == GID_FT)
_verbRedraw = true;
op = fetchScriptByte();
@@ -2411,11 +2411,11 @@
// INSANE mode 0: SMUSH movie playback
if (args[1] == 0) {
sp->play((char *)getStringAddressVar(VAR_VIDEONAME), getGameDataPath());
- } else if (_gameId == GID_FT || _gameId == GID_FTDEMO) {
+ } else if (_gameId == GID_FT) {
int insaneVarNum;
int insaneMode;
- if (_gameId == GID_FTDEMO)
+ if ((_gameId == GID_FT) && (_features & GF_DEMO))
insaneVarNum = 232;
else
insaneVarNum = 233;
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -d -r1.324 -r1.325
--- scumm.h 17 Nov 2003 19:07:45 -0000 1.324
+++ scumm.h 17 Nov 2003 21:16:43 -0000 1.325
@@ -94,6 +94,7 @@
GF_NES = 1 << 18,
GF_ATARI_ST = 1 << 19,
GF_MACINTOSH = 1 << 20,
+ GF_DEMO = 1 << 21,
GF_EXTERNAL_CHARSET = GF_SMALL_HEADER
};
@@ -186,13 +187,9 @@
GID_CMI,
GID_MANIAC,
GID_ZAK,
- GID_PUTTDEMO,
GID_PUTTPUTT,
GID_PJSDEMO,
- GID_MONKEY_SEGA,
- GID_FTDEMO,
- GID_CMIDEMO,
- GID_DIGDEMO
+ GID_MONKEY_SEGA
};
#define _maxRooms res.num[rtRoom]
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.479
retrieving revision 2.480
diff -u -d -r2.479 -r2.480
--- scummvm.cpp 17 Nov 2003 19:07:45 -0000 2.479
+++ scummvm.cpp 17 Nov 2003 21:16:43 -0000 2.480
@@ -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_PUTTDEMO, 6, MDT_ADLIB | MDT_NATIVE,
- GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS},
+ {"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},
{"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,
@@ -186,23 +186,21 @@
/* Scumm Version 7 */
{"ft", "Full Throttle", GID_FT, 7, MDT_NONE,
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE},
- {"ftdemo", "Full Throttle (Mac Demo)", GID_FT, 7, MDT_NONE,
- GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE},
- {"ftpcdemo", "Full Throttle (Demo)", GID_FTDEMO, 7, MDT_NONE,
- GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE},
+ {"ftdemo", "Full Throttle (PC Demo)", GID_FT, 7, MDT_NONE,
+ GF_DEMO | GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE},
{"dig", "The Dig", GID_DIG, 7, MDT_NONE,
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE},
- {"digdemo", "The Dig", GID_DIGDEMO, 7, MDT_NONE,
- GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE},
+ {"digdemo", "The Dig (Demo)", GID_DIG, 7, MDT_NONE,
+ GF_DEMO | GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE},
#ifndef __PALM_OS__ // these are SVGA games not supported under PalmOS
/* Scumm Version 8 */
{"comi", "The Curse of Monkey Island", GID_CMI, 8, MDT_NONE,
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER},
- {"comidemo", "The Curse of Monkey Island", GID_CMIDEMO, 8, MDT_NONE,
- GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER},
-
+ {"comidemo", "The Curse of Monkey Island (Demo)", GID_CMI, 8, MDT_NONE,
+ GF_DEMO | GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER},
+
/* Note that both full versions of Humongous games and demos were often released for
* several interpreter versions... */
/*
@@ -1488,7 +1486,7 @@
// texts have to be drawn before the blast objects. Unless
// someone can think of a better way to achieve this effect.
- if (_gameId == GID_FT || _gameId == GID_FTDEMO) {
+ if (_gameId == GID_FT) {
drawBlastTexts();
drawBlastObjects();
} else {
@@ -2775,10 +2773,14 @@
strcpy(detectName2, g->gameName);
if (g->features & GF_HUMONGOUS) {
strcat(detectName2, ".he0");
- } else if (g->id == GID_FTDEMO) {
+ } else if ((g->id == GID_FT) && (g->features & GF_DEMO)) {
// FIXME: Now it is not possible to have target file and
// main resource file named differently
strcpy(detectName, "ft.000");
+ } else if ((g->id == GID_DIG) && (g->features & GF_DEMO)) {
+ strcpy(detectName, "dig.la0");
+ } else if ((g->id == GID_CMI) && (g->features & GF_DEMO)) {
+ strcpy(detectName, "comi.la0");
} else if (g->version >= 7) {
strcat(detectName2, ".la0");
} else
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- string.cpp 16 Nov 2003 23:53:00 -0000 1.169
+++ string.cpp 17 Nov 2003 21:16:43 -0000 1.170
@@ -401,7 +401,7 @@
// and never time out. We can't do it blindly for all games, because
// it causes problem with the FOA intro.
- if ((_gameId == GID_FT || _gameId == GID_FTDEMO) && a == 4)
+ if ((_gameId == GID_FT) && a == 4)
_talkDelay = -1;
if (!buf[0]) {
More information about the Scummvm-git-logs
mailing list