diff options
Diffstat (limited to 'base')
-rw-r--r-- | base/engine.h | 27 | ||||
-rw-r--r-- | base/gameDetector.cpp | 6 | ||||
-rw-r--r-- | base/gameDetector.h | 2 | ||||
-rw-r--r-- | base/plugins.cpp | 2 |
4 files changed, 4 insertions, 33 deletions
diff --git a/base/engine.h b/base/engine.h index 25ad6e343e..9d77668c40 100644 --- a/base/engine.h +++ b/base/engine.h @@ -29,33 +29,6 @@ extern const char *gScummVMVersion; // e.g. "0.4.1" extern const char *gScummVMBuildDate; // e.g. "2003-06-24" extern const char *gScummVMFullVersion; // e.g. "ScummVM 0.4.1 (2003-06-24)" -// TODO: Get rid of these enums. Ideally, GIDs should be -// 100% local to the module they are defined in. Right now -// we can't make this change since some of the backends -// and also gui/launcher.cpp contain tests on the GID. -// Ideally, all those should be converted to something else. -enum GameId { - GID_SCUMM_FIRST = 1, - GID_SCUMM_LAST = GID_SCUMM_FIRST + 99, - - // Simon the Sorcerer - GID_SIMON_FIRST, - GID_SIMON_LAST = GID_SIMON_FIRST + 49, - - // Beneath a Steel Sky - GID_SKY_FIRST, - GID_SKY_LAST = GID_SKY_FIRST + 9, - - // Broken Sword 2 - GID_SWORD2_FIRST, - GID_SWORD2_LAST = GID_SWORD2_FIRST + 9, - - // Flight of the Amazon Queen - GID_QUEEN_FIRST, - GID_QUEEN_LAST = GID_QUEEN_FIRST + 9 -}; - - class SoundMixer; class GameDetector; class Timer; diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index 7e8c9efa47..11ba903c74 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -179,7 +179,7 @@ GameDetector::GameDetector() { _dumpScripts = false; - _game.features = 0; + memset(&_game, 0, sizeof(_game)); _plugin = 0; } @@ -225,7 +225,7 @@ void listTargets() { GameSettings GameDetector::findGame(const String &gameName, const Plugin **plugin) { // Find the GameSettings for this target const PluginList &plugins = PluginManager::instance().getPlugins(); - GameSettings result = {NULL, NULL, 0, 0, MDT_NONE, 0, NULL}; + GameSettings result = {NULL, NULL, MDT_NONE, 0, NULL}; PluginList::ConstIterator iter = plugins.begin(); for (iter = plugins.begin(); iter != plugins.end(); ++iter) { @@ -290,7 +290,7 @@ void GameDetector::parseCommandLine(int argc, char **argv) { char shortCmdLower; bool isLongCmd, cmdValue; - // Iterate over all comman line arguments, backwards. + // Iterate over all command line arguments, backwards. for (i = argc - 1; i >= 1; i--) { s = argv[i]; diff --git a/base/gameDetector.h b/base/gameDetector.h index f82237eaf9..8e161933e0 100644 --- a/base/gameDetector.h +++ b/base/gameDetector.h @@ -23,7 +23,6 @@ #ifndef GAMEDETECTOR_H #define GAMEDETECTOR_H -#include "base/plugins.h" #include "common/str.h" class Engine; @@ -50,7 +49,6 @@ enum MidiDriverType { struct GameSettings { const char *gameName; const char *description; - byte id, version; int midi; // MidiDriverType values uint32 features; const char *detectname; diff --git a/base/plugins.cpp b/base/plugins.cpp index 3b9616733e..0c9eb267b2 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -52,7 +52,7 @@ GameSettings Plugin::findGame(const char *gameName) const { // Find the GameSettings for this game assert(gameName); GameList games = getSupportedGames(); - GameSettings result = {NULL, NULL, 0, 0, MDT_NONE, 0, NULL}; + GameSettings result = {NULL, NULL, MDT_NONE, 0, NULL}; for (GameList::Iterator g = games.begin(); g != games.end(); ++g) { if (!scumm_stricmp(g->gameName, gameName)) { result = *g; |