diff options
author | Max Horn | 2009-05-26 11:30:21 +0000 |
---|---|---|
committer | Max Horn | 2009-05-26 11:30:21 +0000 |
commit | 7d5f3e1714dff2f0beed0f10bcce01be8204f377 (patch) | |
tree | 7a361b49a88617531c9b983c3e07fc73069b2207 /engines/sci/detection.cpp | |
parent | 94dfc8f6386ebf0f4a13094e68eaec289a974347 (diff) | |
download | scummvm-rg350-7d5f3e1714dff2f0beed0f10bcce01be8204f377.tar.gz scummvm-rg350-7d5f3e1714dff2f0beed0f10bcce01be8204f377.tar.bz2 scummvm-rg350-7d5f3e1714dff2f0beed0f10bcce01be8204f377.zip |
Turned some static tables into static const tables; added some FIXME comments to global static vars that should be removed (many more exist in SCI, Tinsel, and some other engines)
svn-id: r40908
Diffstat (limited to 'engines/sci/detection.cpp')
-rw-r--r-- | engines/sci/detection.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index bf90d15604..b928776dcb 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -3357,7 +3357,7 @@ static const struct SciGameDescription SciGameDescriptions[] = { * The fallback game descriptor used by the SCI engine's fallbackDetector. * Contents of this struct are to be overwritten by the fallbackDetector. */ -static SciGameDescription g_fallbackDesc = { +static SciGameDescription s_fallbackDesc = { { "", "", @@ -3463,23 +3463,23 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fsl return 0; // Set some defaults - g_fallbackDesc.desc.gameid = "sci"; - g_fallbackDesc.desc.extra = ""; - g_fallbackDesc.desc.language = Common::UNK_LANG; - g_fallbackDesc.desc.platform = exePlatform; - g_fallbackDesc.desc.flags = ADGF_NO_FLAGS; - g_fallbackDesc.version = SCI_VERSION_0; + s_fallbackDesc.desc.gameid = "sci"; + s_fallbackDesc.desc.extra = ""; + s_fallbackDesc.desc.language = Common::UNK_LANG; + s_fallbackDesc.desc.platform = exePlatform; + s_fallbackDesc.desc.flags = ADGF_NO_FLAGS; + s_fallbackDesc.version = SCI_VERSION_0; printf("If this is *NOT* a fan-modified version (in particular, not a fan-made\n"); printf("translation), please, report the data above, including the following\n"); printf("version number, from the game's executable:\n"); // Try to parse the executable version - if (getSciVersionFromString(exeVersionString, &g_fallbackDesc.version, g_fallbackDesc.desc.platform)) { + if (getSciVersionFromString(exeVersionString, &s_fallbackDesc.version, s_fallbackDesc.desc.platform)) { printf("Detected version: %s, parsed SCI version: %s\n", - exeVersionString.c_str(), versionNames[g_fallbackDesc.version]); + exeVersionString.c_str(), versionNames[s_fallbackDesc.version]); - return (const ADGameDescription *)&g_fallbackDesc; + return (const ADGameDescription *)&s_fallbackDesc; } else { printf("Couldn't parse the interpreter version: %s (by executable scan)\n", exeVersionString.c_str()); |