diff options
author | Max Horn | 2006-04-08 08:23:33 +0000 |
---|---|---|
committer | Max Horn | 2006-04-08 08:23:33 +0000 |
commit | 9c77c2ecd1beb3026df8249c5aed271616bc6449 (patch) | |
tree | 6df21e591e09bc2660cf40c17dba062415b33443 | |
parent | 54b99891cb85b1e5112e9de9e44cc60149709829 (diff) | |
download | scummvm-rg350-9c77c2ecd1beb3026df8249c5aed271616bc6449.tar.gz scummvm-rg350-9c77c2ecd1beb3026df8249c5aed271616bc6449.tar.bz2 scummvm-rg350-9c77c2ecd1beb3026df8249c5aed271616bc6449.zip |
Renamed various *GameSettings to GameSettings (our namespaces are enough to distinguish them)
svn-id: r21684
-rw-r--r-- | engines/scumm/cursor.cpp | 2 | ||||
-rw-r--r-- | engines/scumm/he/intern_he.h | 16 | ||||
-rw-r--r-- | engines/scumm/intern.h | 18 | ||||
-rw-r--r-- | engines/scumm/plugin.cpp | 20 | ||||
-rw-r--r-- | engines/scumm/plugin.h | 2 | ||||
-rw-r--r-- | engines/scumm/scumm.cpp | 28 | ||||
-rw-r--r-- | engines/scumm/scumm.h | 4 |
7 files changed, 44 insertions, 46 deletions
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp index b9dd2302e3..1d64c42328 100644 --- a/engines/scumm/cursor.cpp +++ b/engines/scumm/cursor.cpp @@ -93,7 +93,7 @@ static const byte default_v6_cursor[] = { 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, }; -ScummEngine_v5::ScummEngine_v5(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_v5::ScummEngine_v5(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine(detector, syst, gs, md5sum, subst) { for (int i = 0; i < 4; i++) { diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h index 281ecfa237..da349d004a 100644 --- a/engines/scumm/he/intern_he.h +++ b/engines/scumm/he/intern_he.h @@ -51,7 +51,7 @@ protected: Common::File _hFileTable[17]; public: - ScummEngine_v60he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v6(detector, syst, gs, md5sum, subst) {} + ScummEngine_v60he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v6(detector, syst, gs, md5sum, subst) {} virtual void scummInit(); @@ -116,7 +116,7 @@ protected: bool _skipProcessActors; public: - ScummEngine_v70he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_v70he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); ~ScummEngine_v70he(); Wiz *_wiz; @@ -182,7 +182,7 @@ protected: class ScummEngine_v71he : public ScummEngine_v70he { public: - ScummEngine_v71he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_v71he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); protected: virtual void saveOrLoad(Serializer *s); @@ -237,7 +237,7 @@ protected: WizParameters _wizParams; public: - ScummEngine_v72he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_v72he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); virtual void scummInit(); @@ -348,7 +348,7 @@ protected: int32 _heSndResId, _curSndId, _sndPtrOffs, _sndTmrOffs; public: - ScummEngine_v80he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_v80he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); protected: virtual void setupOpcodes(); @@ -421,7 +421,7 @@ protected: int32 _curSpriteGroupId; public: - ScummEngine_v90he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_v90he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); ~ScummEngine_v90he(); virtual void scummInit(); @@ -518,7 +518,7 @@ protected: class ScummEngine_v99he : public ScummEngine_v90he { public: - ScummEngine_v99he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v90he(detector, syst, gs, md5sum, subst) {} + ScummEngine_v99he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v90he(detector, syst, gs, md5sum, subst) {} virtual void scummInit(); @@ -549,7 +549,7 @@ protected: const OpcodeEntryV100he *_opcodesV100he; public: - ScummEngine_v100he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v99he(detector, syst, gs, md5sum, subst) {} + ScummEngine_v100he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v99he(detector, syst, gs, md5sum, subst) {} protected: virtual void setupOpcodes(); diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h index 489214a473..d31dbf298d 100644 --- a/engines/scumm/intern.h +++ b/engines/scumm/intern.h @@ -50,7 +50,7 @@ protected: byte _cursorHotspots[2 * 4]; public: - ScummEngine_v5(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_v5(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); protected: virtual void setupOpcodes(); @@ -193,7 +193,7 @@ protected: */ class ScummEngine_v4 : public ScummEngine_v5 { public: - ScummEngine_v4(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_v4(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); virtual void scummInit(); @@ -212,7 +212,7 @@ protected: */ class ScummEngine_v3 : public ScummEngine_v4 { public: - ScummEngine_v3(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_v3(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); protected: virtual void readRoomsOffsets(); @@ -224,7 +224,7 @@ protected: */ class ScummEngine_v3old : public ScummEngine_v3 { public: - ScummEngine_v3old(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_v3old(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); protected: virtual void readResTypeList(int id, const char *name); @@ -257,7 +257,7 @@ protected: int8 _mouseOverBoxV2; public: - ScummEngine_v2(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_v2(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); virtual void scummInit(); @@ -403,7 +403,7 @@ protected: int _currentMode; public: - ScummEngine_c64(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_c64(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); virtual void scummInit(); @@ -555,7 +555,7 @@ protected: public: - ScummEngine_v6(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_v6(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); virtual void scummInit(); @@ -784,7 +784,7 @@ protected: #ifndef DISABLE_SCUMM_7_8 class ScummEngine_v7 : public ScummEngine_v6 { public: - ScummEngine_v7(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_v7(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); ~ScummEngine_v7(); struct LangIndexNode { @@ -865,7 +865,7 @@ protected: ObjectNameId *_objectIDMap; public: - ScummEngine_v8(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine_v8(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); ~ScummEngine_v8(); protected: diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp index 9f5319a327..1e3fc0abbc 100644 --- a/engines/scumm/plugin.cpp +++ b/engines/scumm/plugin.cpp @@ -61,7 +61,7 @@ struct ObsoleteGameID { Common::Platform platform; }; -static const Common::Platform UNK = Common::kPlatformUnknown; +#define UNK Common::kPlatformUnknown @@ -152,8 +152,6 @@ static const PlainGameDescriptor gameDescriptions[] = { /** * Conversion table mapping old obsolete game IDs to the * corresponding new game ID and platform combination. - * - * We use an ugly macro 'UNK' here to make the following table more readable. */ static const ObsoleteGameID obsoleteGameIDsTable[] = { {"bluesabctimedemo", "bluesabctime", UNK}, @@ -188,7 +186,7 @@ static const ObsoleteGameID obsoleteGameIDsTable[] = { {NULL, NULL, UNK} }; -static const ScummGameSettings scumm_settings[] = { +static const GameSettings scumm_settings[] = { /* Scumm Version 1 */ /* Scumm Version 2 */ @@ -389,10 +387,10 @@ static const ScummGameSettings scumm_settings[] = { // The following table contains information about variants of our various games. // We index into it with help of md5table (from scumm-md5.h), to find the correct -// ScummGameSettings for a given game variant. +// GameSettings for a given game variant. // // Note: This will probably eventually be merged with the scumm_settings table. -static const ScummGameSettings extra_versions[] = { +static const GameSettings extra_versions[] = { // The C64 version of MM is detected via the platform field and hence has no seperate entry in this list {"maniac", "V2", GID_MANIAC, 2, 0, MDT_PCSPK, GF_SMALL_HEADER | GF_NO_SCALING | GF_16COLOR | GF_USE_KEY | GF_OLD_BUNDLE, UNK}, {"maniac", "NES", GID_MANIAC, 1, 0, MDT_NONE, GF_SMALL_HEADER | GF_NO_SCALING | GF_16COLOR | GF_USE_KEY | GF_OLD_BUNDLE, Common::kPlatformNES}, @@ -497,7 +495,6 @@ static const ScummGameSettings extra_versions[] = { {NULL, NULL, 0, 0, MDT_NONE, 0, 0, UNK} }; - static const SubstResFileNames substResFileNameTable[] = { // The first few entries for 00.LFL/01.LFL files are here for two reasons: // 1) For the detector to detect these games @@ -727,6 +724,7 @@ static const SubstResFileNames substResFileNameTable[] = { { NULL, NULL, kGenAsIs } }; + #pragma mark - #pragma mark --- Miscellaneous --- #pragma mark - @@ -885,7 +883,7 @@ enum { kDetectNameMethodsCount = 8 }; -static bool generateDetectName(const ScummGameSettings *g, int method, char *detectName) { +static bool generateDetectName(const GameSettings *g, int method, char *detectName) { detectName[0] = '\0'; switch (method) { @@ -944,7 +942,7 @@ static bool generateDetectName(const ScummGameSettings *g, int method, char *det DetectedGameList Engine_SCUMM_detectGames(const FSList &fslist) { DetectedGameList detectedGames; - const ScummGameSettings *g; + const GameSettings *g; char detectName[128]; char tempName[128]; SubstResFileNames subst = { 0, 0, kGenAsIs }; @@ -1215,7 +1213,7 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) { // Lookup the game ID in our database. If this lookup fails, then // the game ID is unknown, and we have to abort. - const ScummGameSettings *g = scumm_settings; + const GameSettings *g = scumm_settings; while (g->gameid) { if (!scumm_stricmp(detector->_gameid.c_str(), g->gameid)) break; @@ -1233,7 +1231,7 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) { SubstResFileNames subst = { 0, 0, kGenAsIs }; bool found = false; - ScummGameSettings game = *g; + GameSettings game = *g; // To this end, we first have to figure out what the proper detection file // is (00.LFL, 000.LFL, ...). So we iterate over all possible names, diff --git a/engines/scumm/plugin.h b/engines/scumm/plugin.h index 13346c4058..59c30f5824 100644 --- a/engines/scumm/plugin.h +++ b/engines/scumm/plugin.h @@ -30,7 +30,7 @@ * Descriptor of a specific SCUMM game. Used internally to store * information about the tons of game variants that exist. */ -struct ScummGameSettings { +struct GameSettings { const char *gameid; const char *variant; byte id, version, heversion; diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index e0cb903f65..7ee72bae50 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -81,7 +81,7 @@ namespace Scumm { ScummEngine *g_scumm = 0; -ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : Engine(syst), _game(gs), _substResFileName(subst), @@ -677,21 +677,21 @@ ScummEngine::~ScummEngine() { delete _debugger; } -ScummEngine_v4::ScummEngine_v4(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_v4::ScummEngine_v4(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v5(detector, syst, gs, md5sum, subst) { _resourceHeaderSize = 6; } -ScummEngine_v3::ScummEngine_v3(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_v3::ScummEngine_v3(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v4(detector, syst, gs, md5sum, subst) { } -ScummEngine_v3old::ScummEngine_v3old(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_v3old::ScummEngine_v3old(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v3(detector, syst, gs, md5sum, subst) { _resourceHeaderSize = 4; } -ScummEngine_v2::ScummEngine_v2(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_v2::ScummEngine_v2(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v3old(detector, syst, gs, md5sum, subst) { VAR_SENTENCE_VERB = 0xFF; @@ -705,13 +705,13 @@ ScummEngine_v2::ScummEngine_v2(GameDetector *detector, OSystem *syst, const Scum VAR_CLICK_OBJECT = 0xFF; } -ScummEngine_c64::ScummEngine_c64(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_c64::ScummEngine_c64(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v2(detector, syst, gs, md5sum, subst) { _currentMode = 0; } -ScummEngine_v6::ScummEngine_v6(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_v6::ScummEngine_v6(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine(detector, syst, gs, md5sum, subst) { _blastObjectQueuePos = 0; memset(_blastObjectQueue, 0, sizeof(_blastObjectQueue)); @@ -733,7 +733,7 @@ ScummEngine_v6::ScummEngine_v6(GameDetector *detector, OSystem *syst, const Scum } #ifndef DISABLE_HE -ScummEngine_v70he::ScummEngine_v70he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_v70he::ScummEngine_v70he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v60he(detector, syst, gs, md5sum, subst) { if (_game.platform == Common::kPlatformMacintosh && (_game.heversion >= 72 && _game.heversion <= 73)) _resExtractor = new MacResExtractor(this); @@ -765,7 +765,7 @@ ScummEngine_v70he::~ScummEngine_v70he() { free(_storedFlObjects); } -ScummEngine_v71he::ScummEngine_v71he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_v71he::ScummEngine_v71he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v70he(detector, syst, gs, md5sum, subst) { _auxBlocksNum = 0; memset(_auxBlocks, 0, sizeof(_auxBlocks)); @@ -773,7 +773,7 @@ ScummEngine_v71he::ScummEngine_v71he(GameDetector *detector, OSystem *syst, cons memset(_auxEntries, 0, sizeof(_auxEntries)); } -ScummEngine_v72he::ScummEngine_v72he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_v72he::ScummEngine_v72he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v71he(detector, syst, gs, md5sum, subst) { VAR_NUM_ROOMS = 0xFF; VAR_NUM_SCRIPTS = 0xFF; @@ -784,7 +784,7 @@ ScummEngine_v72he::ScummEngine_v72he(GameDetector *detector, OSystem *syst, cons VAR_POLYGONS_ONLY = 0xFF; } -ScummEngine_v80he::ScummEngine_v80he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_v80he::ScummEngine_v80he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v72he(detector, syst, gs, md5sum, subst) { _heSndResId = 0; _curSndId = 0; @@ -797,7 +797,7 @@ ScummEngine_v80he::ScummEngine_v80he(GameDetector *detector, OSystem *syst, cons VAR_COLOR_DEPTH = 0xFF; } -ScummEngine_v90he::ScummEngine_v90he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_v90he::ScummEngine_v90he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v80he(detector, syst, gs, md5sum, subst) { _sprite = new Sprite(this); @@ -822,7 +822,7 @@ ScummEngine_v90he::~ScummEngine_v90he() { #endif #ifndef DISABLE_SCUMM_7_8 -ScummEngine_v7::ScummEngine_v7(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_v7::ScummEngine_v7(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v6(detector, syst, gs, md5sum, subst) { _verbCharset = 0; _existLanguageFile = false; @@ -836,7 +836,7 @@ ScummEngine_v7::~ScummEngine_v7() { free(_languageIndex); } -ScummEngine_v8::ScummEngine_v8(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) +ScummEngine_v8::ScummEngine_v8(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v7(detector, syst, gs, md5sum, subst) { _objectIDMap = 0; } diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 88d9d6453e..ee4ef84bf6 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -428,7 +428,7 @@ public: ScummDebugger *_debugger; // Core variables - ScummGameSettings _game; + GameSettings _game; uint8 _gameMD5[16]; /** Random number generator */ @@ -445,7 +445,7 @@ protected: public: // Constructor / Destructor - ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); virtual ~ScummEngine(); /** Startup function, main loop. */ |