[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.45,2.46 imuse.cpp,2.65,2.66 imuse.h,1.33,1.34 imuse_digi.cpp,1.19,1.20 imuse_digi.h,1.3,1.4 saveload.h,1.17,1.18 scumm.h,1.255,1.256 scummvm.cpp,2.246,2.247 sound.cpp,1.136,1.137
Max Horn
fingolfin at users.sourceforge.net
Sat Jun 14 18:43:09 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv26708/scumm
Modified Files:
charset.cpp imuse.cpp imuse.h imuse_digi.cpp imuse_digi.h
saveload.h scumm.h scummvm.cpp sound.cpp
Log Message:
moved GameId declaration to common/engine.h (more logical); moved scumm specific stuff from gameDetector.h to scumm.h; cleaned up some #includes (ideally, never #include something in a header file if you can avoid it - this cuts down interdepencies)
Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.45
retrieving revision 2.46
diff -u -d -r2.45 -r2.46
--- charset.cpp 8 Jun 2003 15:17:13 -0000 2.45
+++ charset.cpp 15 Jun 2003 01:42:14 -0000 2.46
@@ -22,6 +22,7 @@
#include "charset.h"
#include "scumm.h"
#include "nut_renderer.h"
+#include "common/gameDetector.h"
CharsetRenderer::CharsetRenderer(Scumm *vm) {
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.65
retrieving revision 2.66
diff -u -d -r2.65 -r2.66
--- imuse.cpp 14 Jun 2003 18:52:29 -0000 2.65
+++ imuse.cpp 15 Jun 2003 01:42:14 -0000 2.66
@@ -20,13 +20,14 @@
*/
#include "stdafx.h"
-#include "scumm/scumm.h"
-#include "sound/mididrv.h"
-#include "scumm/imuse.h"
-#include "scumm/instrument.h"
-#include "scumm/saveload.h"
-#include "common/util.h"
+#include "imuse.h"
#include "imuse_internal.h"
+#include "instrument.h"
+#include "saveload.h"
+#include "scumm.h"
+#include "common/util.h"
+#include "sound/mididrv.h"
+#include "common/gameDetector.h" // For kDefaultMasterVolume etc.
Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- imuse.h 23 May 2003 18:35:52 -0000 1.33
+++ imuse.h 15 Jun 2003 01:42:15 -0000 1.34
@@ -23,6 +23,8 @@
#ifndef IMUSE_H
#define IMUSE_H
+#include "scummsys.h"
+
class IMuseInternal;
class MidiDriver;
class OSystem;
Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- imuse_digi.cpp 15 Jun 2003 01:00:43 -0000 1.19
+++ imuse_digi.cpp 15 Jun 2003 01:42:15 -0000 1.20
@@ -20,10 +20,11 @@
*/
#include "stdafx.h"
-#include "scumm/scumm.h"
-#include "scumm/imuse_digi.h"
-#include "scumm/sound.h"
+#include "imuse_digi.h"
+#include "scumm.h"
+#include "sound.h"
#include "sound/mixer.h"
+#include "common/timer.h"
////////////////////////////////////////
//
Index: imuse_digi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- imuse_digi.h 15 Jun 2003 01:00:43 -0000 1.3
+++ imuse_digi.h 15 Jun 2003 01:42:15 -0000 1.4
@@ -23,6 +23,8 @@
#ifndef IMUSE_DIGI_H
#define IMUSE_DIGI_H
+#include "scummsys.h"
+
#define MAX_DIGITAL_CHANNELS 8
#define MAX_IMUSE_JUMPS 1
#define MAX_IMUSE_REGIONS 3
Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- saveload.h 28 May 2003 18:13:30 -0000 1.17
+++ saveload.h 15 Jun 2003 01:42:15 -0000 1.18
@@ -22,6 +22,8 @@
#ifndef SAVELOAD_H
#define SAVELOAD_H
+#include "scummsys.h"
+
// Support for "old" savegames (made with 2501 CVS build)
// Can be useful for other ports too :)
@@ -102,6 +104,8 @@
typedef int SerializerSaveReference(void *me, byte type, void *ref);
typedef void *SerializerLoadReference(void *me, byte type, int ref);
+
+class SaveFile;
class Serializer {
public:
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- scumm.h 14 Jun 2003 13:38:22 -0000 1.255
+++ scumm.h 15 Jun 2003 01:42:15 -0000 1.256
@@ -24,13 +24,13 @@
#define SCUMM_H
#include "common/engine.h"
-#include "common/gameDetector.h"
#include "common/file.h"
#include "common/map.h"
#include "common/rect.h"
#include "common/str.h"
-#include "common/timer.h"
-#include "common/util.h"
+
+#include "gfx.h"
+#include "boxes.h"
class CharsetRenderer;
class GameDetector;
@@ -63,6 +63,29 @@
KEY_SET_OPTIONS = 3456 // WinCE
};
+/** SCUMM feature flags. */
+enum GameFeatures {
+ GF_NEW_OPCODES = 1 << 0,
+ GF_NEW_CAMERA = 1 << 1,
+ GF_NEW_COSTUMES = 1 << 2,
+ GF_DIGI_IMUSE = 1 << 3,
+ GF_USE_KEY = 1 << 4,
+ GF_DRAWOBJ_OTHER_ORDER = 1 << 5,
+ GF_SMALL_HEADER = 1 << 6,
+ GF_SMALL_NAMES = 1 << 7,
+ GF_OLD_BUNDLE = 1 << 8,
+ GF_16COLOR = 1 << 9,
+ GF_OLD256 = 1 << 10,
+ GF_AUDIOTRACKS = 1 << 11,
+ GF_NO_SCALLING = 1 << 12,
+ GF_ADLIB_DEFAULT = 1 << 13,
+ GF_AMIGA = 1 << 14,
+ GF_HUMONGOUS = 1 << 15,
+ GF_AFTER_HEV7 = 1 << 16,
+
+ GF_EXTERNAL_CHARSET = GF_SMALL_HEADER
+};
+
enum ObjectClass {
kObjectClassNeverClip = 20,
kObjectClassAlwaysClip = 21,
@@ -72,9 +95,6 @@
kObjectClassPlayer = 31, // Actor is controlled by the player
kObjectClassUntouchable = 32
};
-
-#include "gfx.h"
-#include "boxes.h"
struct MemBlkHeader {
uint32 size;
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.246
retrieving revision 2.247
diff -u -d -r2.246 -r2.247
--- scummvm.cpp 15 Jun 2003 00:54:13 -0000 2.246
+++ scummvm.cpp 15 Jun 2003 01:42:15 -0000 2.247
@@ -82,96 +82,98 @@
/* Scumm Version 1 */
/* Scumm Version 2 */
- {"maniac", "Maniac Mansion", GID_MANIAC, 2,
+ {"maniac", "Maniac Mansion", GID_MANIAC, 2, VersionSettings::ADLIB_ALWAYS,
GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"},
- {"zak", "Zak McKracken and the Alien Mindbenders", GID_ZAK, 2,
+ {"zak", "Zak McKracken and the Alien Mindbenders", GID_ZAK, 2, VersionSettings::ADLIB_ALWAYS,
GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"},
/* Scumm Version 3 */
- {"indy3EGA", "Indiana Jones and the Last Crusade", GID_INDY3, 3,
+ {"indy3EGA", "Indiana Jones and the Last Crusade", GID_INDY3, 3, VersionSettings::ADLIB_ALWAYS,
GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, "00.LFL"},
- {"indy3", "Indiana Jones and the Last Crusade (256)", GID_INDY3_256, 3,
+ {"indy3", "Indiana Jones and the Last Crusade (256)", GID_INDY3_256, 3, VersionSettings::ADLIB_ALWAYS,
GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_OLD256 | GF_ADLIB_DEFAULT, "00.LFL"},
- {"zak256", "Zak McKracken and the Alien Mindbenders (256)", GID_ZAK256, 3,
+ {"zak256", "Zak McKracken and the Alien Mindbenders (256)", GID_ZAK256, 3, VersionSettings::ADLIB_ALWAYS,
GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_OLD256 | GF_AUDIOTRACKS, "00.LFL"},
- {"loom", "Loom", GID_LOOM, 3,
+ {"loom", "Loom", GID_LOOM, 3, VersionSettings::ADLIB_ALWAYS,
GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, "00.LFL"},
/* Scumm Version 4 */
- {"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4,
+ {"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, VersionSettings::ADLIB_ALWAYS,
GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_ADLIB_DEFAULT, "000.LFL"},
- {"pass", "Passport to Adventure", GID_MONKEY_EGA, 4,
+ {"pass", "Passport to Adventure", GID_MONKEY_EGA, 4, VersionSettings::ADLIB_ALWAYS,
GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_ADLIB_DEFAULT, "000.LFL"},
/* Scumm version 5 */
- {"monkeyVGA", "Monkey Island 1 (256 color Floppy version)", GID_MONKEY_VGA, 4,
+ {"monkeyVGA", "Monkey Island 1 (256 color Floppy version)", GID_MONKEY_VGA, 4, VersionSettings::ADLIB_ALWAYS,
GF_SMALL_HEADER | GF_USE_KEY | GF_ADLIB_DEFAULT, "000.LFL"},
- {"loomcd", "Loom (256 color CD version)", GID_LOOM256, 4,
+ {"loomcd", "Loom (256 color CD version)", GID_LOOM256, 4, VersionSettings::ADLIB_ALWAYS,
GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT, "000.LFL"},
- {"monkey", "Monkey Island 1", GID_MONKEY, 5,
+ {"monkey", "Monkey Island 1", GID_MONKEY, 5, VersionSettings::ADLIB_PREFERRED,
GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT, 0},
- {"monkey1", "Monkey Island 1 (alt)", GID_MONKEY, 5,
+ {"monkey1", "Monkey Island 1 (alt)", GID_MONKEY, 5, VersionSettings::ADLIB_PREFERRED,
GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT, 0},
- {"monkey2", "Monkey Island 2: LeChuck's revenge", GID_MONKEY2, 5,
+ {"monkey2", "Monkey Island 2: LeChuck's revenge", GID_MONKEY2, 5, VersionSettings::ADLIB_PREFERRED,
GF_USE_KEY | GF_ADLIB_DEFAULT, 0},
- {"mi2demo", "Monkey Island 2: LeChuck's revenge (Demo)", GID_MONKEY2, 5,
+ {"mi2demo", "Monkey Island 2: LeChuck's revenge (Demo)", GID_MONKEY2, 5, VersionSettings::ADLIB_PREFERRED,
GF_USE_KEY | GF_ADLIB_DEFAULT, 0},
- {"indydemo", "Indiana Jones and the Fate of Atlantis (FM Towns Demo)", GID_INDY4, 5,
+ {"indydemo", "Indiana Jones and the Fate of Atlantis (FM Towns Demo)", GID_INDY4, 5, VersionSettings::ADLIB_PREFERRED,
GF_USE_KEY | GF_ADLIB_DEFAULT, 0},
- {"atlantis", "Indiana Jones and the Fate of Atlantis", GID_INDY4, 5,
+ {"atlantis", "Indiana Jones and the Fate of Atlantis", GID_INDY4, 5, VersionSettings::ADLIB_PREFERRED,
GF_USE_KEY | GF_ADLIB_DEFAULT, 0},
- {"playfate", "Indiana Jones and the Fate of Atlantis (Demo)", GID_INDY4, 5,
+ {"playfate", "Indiana Jones and the Fate of Atlantis (Demo)", GID_INDY4, 5, VersionSettings::ADLIB_PREFERRED,
GF_USE_KEY | GF_ADLIB_DEFAULT, 0},
- {"fate", "Indiana Jones and the Fate of Atlantis (Demo)", GID_INDY4, 5,
+ {"fate", "Indiana Jones and the Fate of Atlantis (Demo)", GID_INDY4, 5, VersionSettings::ADLIB_PREFERRED,
GF_USE_KEY | GF_ADLIB_DEFAULT, 0},
/* Scumm Version 6 */
- {"puttputt", "Putt-Putt Joins The Parade (DOS)", GID_SAMNMAX, 6,
+ {"puttputt", "Putt-Putt Joins The Parade (DOS)", GID_SAMNMAX, 6, VersionSettings::ADLIB_PREFERRED,
GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"puttdemo", "Putt-Putt Joins The Parade (DOS Demo)", GID_PUTTDEMO, 6,
+ {"puttdemo", "Putt-Putt Joins The Parade (DOS Demo)", GID_PUTTDEMO, 6, VersionSettings::ADLIB_PREFERRED,
GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS, 0},
- {"moondemo", "Putt-Putt Goes To The Moon (DOS Demo)", GID_SAMNMAX, 6,
+ {"moondemo", "Putt-Putt Goes To The Moon (DOS Demo)", GID_SAMNMAX, 6, VersionSettings::ADLIB_PREFERRED,
GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"puttmoon", "Putt-Putt Goes To The Moon (DOS)", GID_SAMNMAX, 6,
+ {"puttmoon", "Putt-Putt Goes To The Moon (DOS)", GID_SAMNMAX, 6, VersionSettings::ADLIB_PREFERRED,
GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"funpack", "Putt-Putt's Fun Pack", GID_SAMNMAX, 6,
+ {"funpack", "Putt-Putt's Fun Pack", GID_SAMNMAX, 6, VersionSettings::ADLIB_PREFERRED,
GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"fbpack", "Fatty Bear's Fun Pack", GID_SAMNMAX, 6,
+ {"fbpack", "Fatty Bear's Fun Pack", GID_SAMNMAX, 6, VersionSettings::ADLIB_PREFERRED,
GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"fbear", "Fatty Bear's Birthday Surprise (DOS)", GID_SAMNMAX, 6,
+ {"fbear", "Fatty Bear's Birthday Surprise (DOS)", GID_SAMNMAX, 6, VersionSettings::ADLIB_PREFERRED,
GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"fbdemo", "Fatty Bear's Birthday Surprise (DOS Demo)", GID_SAMNMAX, 6,
+ {"fbdemo", "Fatty Bear's Birthday Surprise (DOS Demo)", GID_SAMNMAX, 6, VersionSettings::ADLIB_PREFERRED,
GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"tentacle", "Day Of The Tentacle", GID_TENTACLE, 6,
+ {"tentacle", "Day Of The Tentacle", GID_TENTACLE, 6, VersionSettings::ADLIB_PREFERRED,
GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT, 0},
- {"dottdemo", "Day Of The Tentacle (Demo)", GID_TENTACLE, 6,
+ {"dottdemo", "Day Of The Tentacle (Demo)", GID_TENTACLE, 6, VersionSettings::ADLIB_PREFERRED,
GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT, 0},
- {"samnmax", "Sam & Max", GID_SAMNMAX, 6,
+
+ {"samnmax", "Sam & Max", GID_SAMNMAX, 6, VersionSettings::ADLIB_DONT_CARE,
GF_NEW_OPCODES | GF_USE_KEY | GF_DRAWOBJ_OTHER_ORDER, 0},
- {"samdemo", "Sam & Max (Demo)", GID_SAMNMAX, 6,
+
+ {"samdemo", "Sam & Max (Demo)", GID_SAMNMAX, 6, VersionSettings::ADLIB_PREFERRED,
GF_NEW_OPCODES | GF_USE_KEY | GF_DRAWOBJ_OTHER_ORDER | GF_ADLIB_DEFAULT, 0},
- {"snmdemo", "Sam & Max (Demo)", GID_SAMNMAX, 6,
+ {"snmdemo", "Sam & Max (Demo)", GID_SAMNMAX, 6, VersionSettings::ADLIB_PREFERRED,
GF_NEW_OPCODES | GF_USE_KEY | GF_DRAWOBJ_OTHER_ORDER | GF_ADLIB_DEFAULT, 0},
- {"snmidemo", "Sam & Max (Interactive WIP Demo)", GID_SAMNMAX, 6,
+ {"snmidemo", "Sam & Max (Interactive WIP Demo)", GID_SAMNMAX, 6, VersionSettings::ADLIB_PREFERRED,
GF_NEW_OPCODES | GF_USE_KEY | GF_DRAWOBJ_OTHER_ORDER | GF_ADLIB_DEFAULT, 0},
- {"test", "Test demo game", GID_SAMNMAX, 6, GF_NEW_OPCODES, 0},
+ {"test", "Test demo game", GID_SAMNMAX, 6, VersionSettings::ADLIB_DONT_CARE, GF_NEW_OPCODES, 0},
/* Humongous Entertainment Scumm Version 7 */
- {"farmdemo", "Let's Explore the Farm with Buzzy (Demo)", GID_SAMNMAX, 6,
+ {"farmdemo", "Let's Explore the Farm with Buzzy (Demo)", GID_SAMNMAX, 6, VersionSettings::ADLIB_DONT_CARE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
/* Scumm Version 7 */
- {"ft", "Full Throttle", GID_FT, 7,
+ {"ft", "Full Throttle", GID_FT, 7, VersionSettings::ADLIB_DONT_CARE,
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE, 0},
- {"dig", "The Dig", GID_DIG, 7,
+ {"dig", "The Dig", GID_DIG, 7, VersionSettings::ADLIB_DONT_CARE,
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE, 0},
/* Scumm Version 8 */
- {"comi", "The Curse of Monkey Island", GID_CMI, 8,
+ {"comi", "The Curse of Monkey Island", GID_CMI, 8, VersionSettings::ADLIB_DONT_CARE,
GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER, 0},
- {NULL, NULL, 0, 0, 0, NULL}
+ {NULL, NULL, 0, 0, VersionSettings::ADLIB_DONT_CARE, 0, NULL}
};
const VersionSettings *Engine_SCUMM_targetList() {
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- sound.cpp 15 Jun 2003 00:54:13 -0000 1.136
+++ sound.cpp 15 Jun 2003 01:42:15 -0000 1.137
@@ -21,16 +21,17 @@
*/
#include "stdafx.h"
+#include "actor.h"
+#include "bundle.h"
+#include "imuse.h"
+#include "imuse_digi.h"
+#include "player_v2.h"
#include "scumm.h"
#include "sound.h"
#include "sound/mididrv.h"
#include "sound/mixer.h"
-#include "imuse.h"
-#include "imuse_digi.h"
-#include "player_v2.h"
-#include "actor.h"
-#include "bundle.h"
#include "common/config-file.h"
+#include "common/timer.h"
#include "common/util.h"
#include "sound/midiparser.h"
More information about the Scummvm-git-logs
mailing list