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/wintermute | |
| 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/wintermute')
| -rw-r--r-- | engines/wintermute/detection.cpp | 6 | ||||
| -rw-r--r-- | engines/wintermute/wintermute.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp index 495a937f16..f77eb5c64d 100644 --- a/engines/wintermute/detection.cpp +++ b/engines/wintermute/detection.cpp @@ -94,8 +94,8 @@ public: s_fallbackDesc.language = Common::UNK_LANG; s_fallbackDesc.flags = ADGF_UNSTABLE; s_fallbackDesc.platform = Common::kPlatformWindows; // default to Windows - s_fallbackDesc.gameid = "wintermute"; - s_fallbackDesc.guioptions = GUIO0(); + s_fallbackDesc.gameId = "wintermute"; + s_fallbackDesc.guiOptions = GUIO0(); if (allFiles.contains("data.dcp")) { Common::String name, caption; @@ -109,7 +109,7 @@ public: // Prefix to avoid collisions with actually known games name = "wmeunk-" + name; Common::strlcpy(s_fallbackGameIdBuf, name.c_str(), sizeof(s_fallbackGameIdBuf) - 1); - s_fallbackDesc.gameid = s_fallbackGameIdBuf; + s_fallbackDesc.gameId = s_fallbackGameIdBuf; if (caption != name) { caption += " (unknown version) "; char *offset = s_fallbackGameIdBuf + name.size() + 1; diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp index e35bb60c3d..955f2dc1c2 100644 --- a/engines/wintermute/wintermute.cpp +++ b/engines/wintermute/wintermute.cpp @@ -133,7 +133,7 @@ Common::Error WintermuteEngine::run() { } int WintermuteEngine::init() { - BaseEngine::createInstance(_targetName, _gameDescription->adDesc.gameid, _gameDescription->adDesc.language, _gameDescription->targetExecutable); + BaseEngine::createInstance(_targetName, _gameDescription->adDesc.gameId, _gameDescription->adDesc.language, _gameDescription->targetExecutable); _game = new AdGame(_targetName); if (!_game) { return 1; |