diff options
| author | Johannes Schickel | 2016-03-08 18:53:55 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2016-03-08 19:01:38 +0100 |
| commit | 3aecd8ef2a79dbbd43dd0e39e42b11409720361f (patch) | |
| tree | e81e58d83f0e6181ac6fd39a004b7de6f52fbb9f /engines/sci | |
| parent | 0b6befdcc5f5f8d6d5deb2831104fb7abc0f7466 (diff) | |
| download | scummvm-rg350-3aecd8ef2a79dbbd43dd0e39e42b11409720361f.tar.gz scummvm-rg350-3aecd8ef2a79dbbd43dd0e39e42b11409720361f.tar.bz2 scummvm-rg350-3aecd8ef2a79dbbd43dd0e39e42b11409720361f.zip | |
ENGINES: Make variable names of ADGameDescription conform to our guidelines.
gameid -> gameId
guioptions -> guiOptions
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/detection.cpp | 10 | ||||
| -rw-r--r-- | engines/sci/sci.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 3001f47260..c6cb883806 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -526,8 +526,8 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles, s_fallbackDesc.language = Common::EN_ANY; s_fallbackDesc.flags = ADGF_NO_FLAGS; s_fallbackDesc.platform = Common::kPlatformDOS; // default to PC platform - s_fallbackDesc.gameid = "sci"; - s_fallbackDesc.guioptions = GUIO3(GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI); + s_fallbackDesc.gameId = "sci"; + s_fallbackDesc.guiOptions = GUIO3(GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI); if (allFiles.contains("resource.map") || allFiles.contains("Data1") || allFiles.contains("resmap.001") || allFiles.contains("resmap.001")) { @@ -610,7 +610,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles, Common::String gameId = convertSierraGameId(sierraGameId, &s_fallbackDesc.flags, resMan); strncpy(s_fallbackGameIdBuf, gameId.c_str(), sizeof(s_fallbackGameIdBuf) - 1); s_fallbackGameIdBuf[sizeof(s_fallbackGameIdBuf) - 1] = 0; // Make sure string is NULL terminated - s_fallbackDesc.gameid = s_fallbackGameIdBuf; + s_fallbackDesc.gameId = s_fallbackGameIdBuf; // Try to determine the game language // Load up text 0 and start looking for "#" characters @@ -653,7 +653,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles, const bool isCD = (s_fallbackDesc.flags & ADGF_CD); if (!isCD) - s_fallbackDesc.guioptions = GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI); + s_fallbackDesc.guiOptions = GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI); if (gameId.hasSuffix("sci")) { s_fallbackDesc.extra = "SCI"; @@ -686,7 +686,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles, bool SciMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const GameIdStrToEnum *g = s_gameIdStrToEnum; for (; g->gameidStr; ++g) { - if (0 == strcmp(desc->gameid, g->gameidStr)) { + if (0 == strcmp(desc->gameId, g->gameidStr)) { *engine = new SciEngine(syst, desc, g->gameidEnum); return true; } diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 7c985dfab4..b97fb0e440 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -834,7 +834,7 @@ Console *SciEngine::getSciDebugger() { } const char *SciEngine::getGameIdStr() const { - return _gameDescription->gameid; + return _gameDescription->gameId; } Common::Language SciEngine::getLanguage() const { |