diff options
| author | Max Horn | 2003-05-21 16:59:51 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-21 16:59:51 +0000 |
| commit | 24005adfd0aa31373332cdd7d0a45c8a0627e3d7 (patch) | |
| tree | 8204c9d45a603340e426f87738a7cdffc9f2b270 /common/gameDetector.cpp | |
| parent | 72d6179c470fc99a05942110fe5338f7b42181dc (diff) | |
| download | scummvm-rg350-24005adfd0aa31373332cdd7d0a45c8a0627e3d7.tar.gz scummvm-rg350-24005adfd0aa31373332cdd7d0a45c8a0627e3d7.tar.bz2 scummvm-rg350-24005adfd0aa31373332cdd7d0a45c8a0627e3d7.zip | |
pedantic fixes
svn-id: r7789
Diffstat (limited to 'common/gameDetector.cpp')
| -rw-r--r-- | common/gameDetector.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index 1815f83043..3257b9885e 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -104,7 +104,7 @@ static const struct GraphicsMode gfx_modes[] = { {"flipping", "Page Flipping", GFX_FLIPPING}, {"dbuffer", "Double Buffer", GFX_DOUBLEBUFFER}, #endif - {0, 0} + {0, 0, 0} }; static const struct Language languages[] = { @@ -579,18 +579,18 @@ bool GameDetector::parseMusicDriver(const char *s) { bool GameDetector::detectGame() { const VersionSettings *gnl = version_settings; - char *realGame, *basename; + const char *realGame, *basename; _gameId = 0; _gameText.clear(); - if (!(realGame = (char *)g_config->get("gameid"))) - realGame = (char *)_gameFileName.c_str(); + if (!(realGame = g_config->get("gameid"))) + realGame = _gameFileName.c_str(); printf("Looking for %s\n", realGame); do { if (!scumm_stricmp(realGame, gnl->filename)) { _gameId = gnl->id; - if ((basename = (char *)g_config->get("basename"))) + if ((basename = g_config->get("basename"))) _gameRealName = basename; else _gameRealName = gnl->filename; |