From 6c298e964f7352d82b13d5f60d8e5cc638176dcd Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Sun, 14 Feb 2016 10:27:44 +0100 Subject: JANITORIAL: Typos detected with lintian & grep --- engines/wintermute/ad/ad_actor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp index 9d5a35464a..4661d3bca0 100644 --- a/engines/wintermute/ad/ad_actor.cpp +++ b/engines/wintermute/ad/ad_actor.cpp @@ -958,13 +958,13 @@ bool AdActor::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, stack->correctParams(1); ScValue *val = stack->pop(); if (!val->isNative()) { - script->runtimeError("actor.%s method accepts an entity refrence only", name); + script->runtimeError("actor.%s method accepts an entity reference only", name); stack->pushNULL(); return STATUS_OK; } AdObject *obj = (AdObject *)val->getNative(); if (!obj || obj->getType() != OBJECT_ENTITY) { - script->runtimeError("actor.%s method accepts an entity refrence only", name); + script->runtimeError("actor.%s method accepts an entity reference only", name); stack->pushNULL(); return STATUS_OK; } -- cgit v1.2.3 From a4b31312091f841cfb58c9d18d676302ee08c4ca Mon Sep 17 00:00:00 2001 From: Tobia Tesan Date: Tue, 23 Feb 2016 22:49:40 +0100 Subject: WINTERMUTE: Fix order of arguments in sprite rotation --- engines/wintermute/base/base_sub_frame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp index 4388942064..6d0c48ff17 100644 --- a/engines/wintermute/base/base_sub_frame.cpp +++ b/engines/wintermute/base/base_sub_frame.cpp @@ -268,7 +268,7 @@ bool BaseSubFrame::draw(int x, int y, BaseObject *registerOwner, float zoomX, fl Common::Point origin(x, y); Common::Point newOrigin; Rect32 oldRect1 = getRect(); - Common::Rect oldRect(oldRect1.top, oldRect1.left, oldRect1.bottom, oldRect1.right); + Common::Rect oldRect(oldRect1.left, oldRect1.top, oldRect1.right, oldRect1.bottom); Common::Point newHotspot; Graphics::TransformStruct transform = Graphics::TransformStruct(zoomX, zoomY, (uint32)rotate, _hotspotX, _hotspotY, blendMode, alpha, _mirrorX, _mirrorY, 0, 0); Rect32 newRect = Graphics::TransformTools::newRect(oldRect, transform, &newHotspot); -- cgit v1.2.3 From 23d74fddb4a8c08c9557ba7ea1293c7ab4147268 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 5 Mar 2016 14:25:56 +0100 Subject: CONFIGURE: Introduced new engine dependency: highres Some backends like GCW0 do no support graphics >320x240 due to the hardware limitation (downscaling is possible but it will ruin the pixel hunting which is often part of the gameplay). Instead of manually updating the list of engines, we now introduce a new dependency. I marked all relevant engines, but some, like tinsel, require more work with putting their relevant high-res games under USE_HIGHRES define. --- engines/wintermute/configure.engine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/configure.engine b/engines/wintermute/configure.engine index bdaf49de3f..55385776de 100644 --- a/engines/wintermute/configure.engine +++ b/engines/wintermute/configure.engine @@ -1,3 +1,3 @@ # This file is included from the main "configure" script # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] -add_engine wintermute "Wintermute" yes "" "" "jpeg png zlib vorbis 16bit" +add_engine wintermute "Wintermute" yes "" "" "jpeg png zlib vorbis 16bit highres" -- cgit v1.2.3 From f29229c0a6e60fa3486436f8454bdd66c3c0796e Mon Sep 17 00:00:00 2001 From: Tobia Tesan Date: Sat, 5 Mar 2016 20:41:19 +0100 Subject: WINTERMUTE: Return Common::String in getGameTargetName() --- engines/wintermute/base/base_engine.h | 2 +- engines/wintermute/base/base_file_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/base/base_engine.h b/engines/wintermute/base/base_engine.h index 0f4a6b0775..cbf5d92d00 100644 --- a/engines/wintermute/base/base_engine.h +++ b/engines/wintermute/base/base_engine.h @@ -74,7 +74,7 @@ public: static const Timer *getTimer(); static const Timer *getLiveTimer(); static void LOG(bool res, const char *fmt, ...); - const char *getGameTargetName() const { return _targetName.c_str(); } + Common::String getGameTargetName() const { return _targetName; } Common::String getGameId() const { return _gameId; } Common::Language getLanguage() const { return _language; } WMETargetExecutable getTargetExecutable() const { diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp index 05830ffcd8..4dce2f1756 100644 --- a/engines/wintermute/base/base_file_manager.cpp +++ b/engines/wintermute/base/base_file_manager.cpp @@ -318,7 +318,7 @@ Common::SeekableReadStream *BaseFileManager::openPkgFile(const Common::String &f bool BaseFileManager::hasFile(const Common::String &filename) { if (scumm_strnicmp(filename.c_str(), "savegame:", 9) == 0) { - BasePersistenceManager pm(BaseEngine::instance().getGameTargetName()); + BasePersistenceManager pm(BaseEngine::instance().getGameTargetName().c_str()); if (filename.size() <= 9) { return false; } -- cgit v1.2.3 From d6c772c4de124a86dcfc5df3ad94b00a0380a17e Mon Sep 17 00:00:00 2001 From: Tobia Tesan Date: Sat, 5 Mar 2016 20:46:43 +0100 Subject: WINTERMUTE: Add detection entry for Carol Reed 5 Demo --- engines/wintermute/detection_tables.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/wintermute') diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h index 25a01766e4..258dd6d570 100644 --- a/engines/wintermute/detection_tables.h +++ b/engines/wintermute/detection_tables.h @@ -185,6 +185,9 @@ static const WMEGameDescription gameDescriptions[] = { // Carol Reed 5 - The Colour of Murder WME_WINENTRY("carolreed5", "", WME_ENTRY1s("data.dcp", "3fcfca44209545d0e26774156427b494", 603660415), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION), + // Carol Reed 5 - The Colour of Murder (1.0 Demo) + WME_WINENTRY("carolreed5", "Demo", + WME_ENTRY1s("data.dcp", "27b3efc018ade5ee8f4adf08b4e3c0dd", 92019500), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION), // Carol Reed 6 - Black Circle WME_WINENTRY("carolreed6", "", WME_ENTRY1s("data.dcp", "0e4c532beecf23d85012168753f41189", 456258147), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION), -- cgit v1.2.3 From 2c4bf8aebd91c7b3fb1ce67b1675cf3e09e38332 Mon Sep 17 00:00:00 2001 From: Tobia Tesan Date: Sat, 5 Mar 2016 20:44:29 +0100 Subject: WINTERMUTE: Remove ADGF_DEMO flag from non-demo carolreed4 entry --- engines/wintermute/detection_tables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h index 25a01766e4..ee023275cb 100644 --- a/engines/wintermute/detection_tables.h +++ b/engines/wintermute/detection_tables.h @@ -181,7 +181,7 @@ static const WMEGameDescription gameDescriptions[] = { WME_ENTRY1s("data.dcp", "b3f8b09bb4b05ee3e9d14697525257f9", 59296246), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION), // Carol Reed 4 - East Side Story WME_WINENTRY("carolreed4", "", - WME_ENTRY1s("data.dcp", "b26377797f060afc2d440d820100c1ce", 529320536), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION), + WME_ENTRY1s("data.dcp", "b26377797f060afc2d440d820100c1ce", 529320536), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION), // Carol Reed 5 - The Colour of Murder WME_WINENTRY("carolreed5", "", WME_ENTRY1s("data.dcp", "3fcfca44209545d0e26774156427b494", 603660415), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION), -- cgit v1.2.3 From 83f921fa8003022c59cffc88d5cf1838cb6c6da6 Mon Sep 17 00:00:00 2001 From: Tobia Tesan Date: Sat, 5 Mar 2016 21:37:34 +0100 Subject: WINTERMUTE: Add fallback for hardcoded absolute path in carolreed5 Carol Reed 5 (the full game, data.dcp hash 27b3efc018ade5ee8f4adf08b4e3c0dd) refers to the absolute path "f:\dokument\spel 5\demo\data\scenes\credits\op_cred_00\op_cred_00.jpg" Appears to fix bug #7067. --- engines/wintermute/base/file/base_disk_file.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/wintermute') diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp index 82a9e24dfb..b474c069db 100644 --- a/engines/wintermute/base/file/base_disk_file.cpp +++ b/engines/wintermute/base/file/base_disk_file.cpp @@ -119,6 +119,8 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) { fixedFilename = filename.c_str() + 14; } else if (fixedFilename.hasPrefix("c:/carol6/svn/data/")) { // Carol Reed 6: Black Circle refers to "c:\carol6\svn\data\sprites\system\help.png" fixedFilename = fixedFilename.c_str() + 19; + } else if (fixedFilename.hasPrefix("f:/dokument/spel 5/demo/data/")) { // Carol Reed 5 (non-demo) refers to "f:\dokument\spel 5\demo\data\scenes\credits\op_cred_00\op_cred_00.jpg" + fixedFilename = fixedFilename.c_str() + 29; } else { error("openDiskFile::Absolute path or invalid filename used in %s", filename.c_str()); } -- cgit v1.2.3 From 5ad4eca257c975a895153d162ff6f3cdc1ef4afb Mon Sep 17 00:00:00 2001 From: Tobia Tesan Date: Sat, 5 Mar 2016 23:50:59 +0100 Subject: WINTERMUTE: Use array to store known broken absolute paths Avoids an if() block that is getting longer --- engines/wintermute/base/file/base_disk_file.cpp | 29 ++++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp index b474c069db..74ed7960a1 100644 --- a/engines/wintermute/base/file/base_disk_file.cpp +++ b/engines/wintermute/base/file/base_disk_file.cpp @@ -113,15 +113,28 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) { Common::String fixedFilename = filename; correctSlashes(fixedFilename); - // Absolute path: TODO: Add specific fallbacks here. + // HACK: There are a few games around which mistakenly refer to absolute paths in the scripts. + // The original interpreter on Windows usually simply ignores them when it can't find them. + // We try to turn the known ones into relative paths. if (fixedFilename.contains(':')) { - if (fixedFilename.hasPrefix("c:/windows/fonts/")) { // East Side Story refers to "c:\windows\fonts\framd.ttf" - fixedFilename = filename.c_str() + 14; - } else if (fixedFilename.hasPrefix("c:/carol6/svn/data/")) { // Carol Reed 6: Black Circle refers to "c:\carol6\svn\data\sprites\system\help.png" - fixedFilename = fixedFilename.c_str() + 19; - } else if (fixedFilename.hasPrefix("f:/dokument/spel 5/demo/data/")) { // Carol Reed 5 (non-demo) refers to "f:\dokument\spel 5\demo\data\scenes\credits\op_cred_00\op_cred_00.jpg" - fixedFilename = fixedFilename.c_str() + 29; - } else { + Common::String knownPrefixes[] = { // Known absolute paths + "c:/windows/fonts/", // East Side Story refers to "c:\windows\fonts\framd.ttf" + "c:/carol6/svn/data/", // Carol Reed 6: Black Circle refers to "c:\carol6\svn\data\sprites\system\help.png" + "f:/dokument/spel 5/demo/data/" // Carol Reed 5 (non-demo) refers to "f:\dokument\spel 5\demo\data\scenes\credits\op_cred_00\op_cred_00.jpg" + }; + + bool matched = false; + + for (uint i = 0; i < ARRAYSIZE(knownPrefixes); i++) { + if (fixedFilename.hasPrefix(knownPrefixes[i])) { + fixedFilename = filename.c_str() + knownPrefixes[i].size(); + matched = true; + } + } + + if (!matched) { + // fixedFilename is unchanged and thus still broken, none of the above workarounds worked. + // We can only bail out error("openDiskFile::Absolute path or invalid filename used in %s", filename.c_str()); } } -- cgit v1.2.3 From 891986fd2be496834ce5c8dc54f0dd09d3271f95 Mon Sep 17 00:00:00 2001 From: Tobia Tesan Date: Sun, 6 Mar 2016 11:33:06 +0100 Subject: WINTERMUTE: Use C strings in absolute path workaround array --- engines/wintermute/base/file/base_disk_file.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp index 74ed7960a1..d0c51616f4 100644 --- a/engines/wintermute/base/file/base_disk_file.cpp +++ b/engines/wintermute/base/file/base_disk_file.cpp @@ -117,7 +117,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) { // The original interpreter on Windows usually simply ignores them when it can't find them. // We try to turn the known ones into relative paths. if (fixedFilename.contains(':')) { - Common::String knownPrefixes[] = { // Known absolute paths + const char* const knownPrefixes[] = { // Known absolute paths "c:/windows/fonts/", // East Side Story refers to "c:\windows\fonts\framd.ttf" "c:/carol6/svn/data/", // Carol Reed 6: Black Circle refers to "c:\carol6\svn\data\sprites\system\help.png" "f:/dokument/spel 5/demo/data/" // Carol Reed 5 (non-demo) refers to "f:\dokument\spel 5\demo\data\scenes\credits\op_cred_00\op_cred_00.jpg" @@ -127,7 +127,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) { for (uint i = 0; i < ARRAYSIZE(knownPrefixes); i++) { if (fixedFilename.hasPrefix(knownPrefixes[i])) { - fixedFilename = filename.c_str() + knownPrefixes[i].size(); + fixedFilename = fixedFilename.c_str() + strlen(knownPrefixes[i]); matched = true; } } -- cgit v1.2.3 From 97dc2a22c4cb9f40956966d682cf9ce0b985960b Mon Sep 17 00:00:00 2001 From: Tobia Tesan Date: Sun, 6 Mar 2016 11:47:24 +0100 Subject: WINTERMUTE: Use Common::String in BasePersistenceManager-ctor --- engines/wintermute/base/base_persistence_manager.cpp | 4 ++-- engines/wintermute/base/base_persistence_manager.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index bb5e0c4091..0a0ba91e5d 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -56,7 +56,7 @@ namespace Wintermute { #define SAVE_MAGIC_3 0x12564154 ////////////////////////////////////////////////////////////////////////// -BasePersistenceManager::BasePersistenceManager(const char *savePrefix, bool deleteSingleton) { +BasePersistenceManager::BasePersistenceManager(const Common::String &savePrefix, bool deleteSingleton) { _saving = false; _offset = 0; _saveStream = nullptr; @@ -91,7 +91,7 @@ BasePersistenceManager::BasePersistenceManager(const char *savePrefix, bool dele _thumbnailDataSize = 0; _thumbnailData = nullptr; - if (savePrefix) { + if (savePrefix != "") { _savePrefix = savePrefix; } else if (_gameRef) { _savePrefix = _gameRef->getGameTargetName(); diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h index 373d1580de..9187976931 100644 --- a/engines/wintermute/base/base_persistence_manager.h +++ b/engines/wintermute/base/base_persistence_manager.h @@ -86,7 +86,7 @@ public: bool transferCharPtr(const char *name, char **val); bool transferString(const char *name, Common::String *val); bool transferVector2(const char *name, Vector2 *val); - BasePersistenceManager(const char *savePrefix = nullptr, bool deleteSingleton = false); + BasePersistenceManager(const Common::String &savePrefix = "", bool deleteSingleton = false); virtual ~BasePersistenceManager(); bool checkVersion(byte verMajor, byte verMinor, byte verBuild); -- cgit v1.2.3 From 9222038a162ebd483f7791006672f2effb0206de Mon Sep 17 00:00:00 2001 From: Tobia Tesan Date: Sun, 6 Mar 2016 12:00:05 +0100 Subject: WINTERMUTE: Use Common::String in arg for initSave --- engines/wintermute/base/base_persistence_manager.cpp | 8 ++++---- engines/wintermute/base/base_persistence_manager.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index 0a0ba91e5d..39462f7a15 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -215,8 +215,8 @@ bool BasePersistenceManager::getSaveExists(int slot) { } ////////////////////////////////////////////////////////////////////////// -bool BasePersistenceManager::initSave(const char *desc) { - if (!desc) { +bool BasePersistenceManager::initSave(const Common::String &desc) { + if (desc == "") { return STATUS_FAILED; } @@ -297,11 +297,11 @@ bool BasePersistenceManager::initSave(const char *desc) { uint32 dataOffset = _offset + sizeof(uint32) + // data offset - sizeof(uint32) + strlen(desc) + 1 + // description + sizeof(uint32) + strlen(desc.c_str()) + 1 + // description sizeof(uint32); // timestamp putDWORD(dataOffset); - putString(desc); + putString(desc.c_str()); g_system->getTimeAndDate(_savedTimestamp); putTimeDate(_savedTimestamp); diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h index 9187976931..760b45c907 100644 --- a/engines/wintermute/base/base_persistence_manager.h +++ b/engines/wintermute/base/base_persistence_manager.h @@ -63,7 +63,7 @@ public: uint32 getMaxUsedSlot(); bool getSaveExists(int slot); bool initLoad(const Common::String &filename); - bool initSave(const char *desc); + bool initSave(const Common::String &desc); bool getBytes(byte *buffer, uint32 size); bool putBytes(byte *buffer, uint32 size); uint32 _offset; -- cgit v1.2.3 From dba38332d19f9aa902eae8b232c8d0f4048edb0a Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Sun, 6 Mar 2016 12:26:57 +0100 Subject: WINTERMUTE: Actually use new BasePersistenceManager constructor --- engines/wintermute/base/base_file_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp index 4dce2f1756..05830ffcd8 100644 --- a/engines/wintermute/base/base_file_manager.cpp +++ b/engines/wintermute/base/base_file_manager.cpp @@ -318,7 +318,7 @@ Common::SeekableReadStream *BaseFileManager::openPkgFile(const Common::String &f bool BaseFileManager::hasFile(const Common::String &filename) { if (scumm_strnicmp(filename.c_str(), "savegame:", 9) == 0) { - BasePersistenceManager pm(BaseEngine::instance().getGameTargetName().c_str()); + BasePersistenceManager pm(BaseEngine::instance().getGameTargetName()); if (filename.size() <= 9) { return false; } -- cgit v1.2.3 From 0b6befdcc5f5f8d6d5deb2831104fb7abc0f7466 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 8 Mar 2016 18:30:58 +0100 Subject: ENGINES: Make variable names of AdvancedMetaEngine conform to our guidelines. _singleid -> _singleId _gameids -> _gameIds _guioptions -> _guiOptions --- engines/wintermute/detection.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp index aca682ae99..495a937f16 100644 --- a/engines/wintermute/detection.cpp +++ b/engines/wintermute/detection.cpp @@ -75,8 +75,8 @@ static const char *directoryGlobs[] = { class WintermuteMetaEngine : public AdvancedMetaEngine { public: WintermuteMetaEngine() : AdvancedMetaEngine(Wintermute::gameDescriptions, sizeof(WMEGameDescription), Wintermute::wintermuteGames, gameGuiOptions) { - _singleid = "wintermute"; - _guioptions = GUIO2(GUIO_NOMIDI, GAMEOPTION_SHOW_FPS); + _singleId = "wintermute"; + _guiOptions = GUIO2(GUIO_NOMIDI, GAMEOPTION_SHOW_FPS); _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } -- cgit v1.2.3 From 3aecd8ef2a79dbbd43dd0e39e42b11409720361f Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 8 Mar 2016 18:53:55 +0100 Subject: ENGINES: Make variable names of ADGameDescription conform to our guidelines. gameid -> gameId guioptions -> guiOptions --- engines/wintermute/detection.cpp | 6 +++--- engines/wintermute/wintermute.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/wintermute') 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; -- cgit v1.2.3