diff options
author | Bastien Bouclet | 2018-06-30 21:49:41 +0200 |
---|---|---|
committer | Bastien Bouclet | 2018-06-30 21:57:18 +0200 |
commit | b40e93e11a77ca5b810ba2e6a6678ef25962f057 (patch) | |
tree | 9c1fbc49873904d9f354f0e026ab57546146101c /engines/mohawk/riven.cpp | |
parent | 0ed412a8abc12b68bf7c4ae3ead383d700ea5a16 (diff) | |
download | scummvm-rg350-b40e93e11a77ca5b810ba2e6a6678ef25962f057.tar.gz scummvm-rg350-b40e93e11a77ca5b810ba2e6a6678ef25962f057.tar.bz2 scummvm-rg350-b40e93e11a77ca5b810ba2e6a6678ef25962f057.zip |
MOHAWK: Push down the include of advancedDetector.h
So the whole engine is not recompiled when making changes to the
detection code.
Diffstat (limited to 'engines/mohawk/riven.cpp')
-rw-r--r-- | engines/mohawk/riven.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index 163785ee72..57d7da3770 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -506,15 +506,11 @@ Common::String MohawkEngine_Riven::getLanguageDatafile(char prefix) const { if (!(getFeatures() & GF_25TH) || getLanguage() == Common::EN_ANY) return ""; - if (!Common::String(_gameDescription->desc.filesDescriptions[1].fileName).hasPrefix("a_data_")) { - warning("Malformed 25th Anniversary Riven entry"); - + Common::String language = getDatafileLanguageName(); + if (language.empty()) { return ""; } - const char *fname = _gameDescription->desc.filesDescriptions[1].fileName; - Common::String language(&fname[7], strlen(fname) - 7 - 4); - return Common::String::format("%c_data_%s.mhk", prefix, language.c_str()); } |