diff options
| author | Strangerke | 2012-11-17 09:59:50 +0100 |
|---|---|---|
| committer | Strangerke | 2012-11-17 09:59:50 +0100 |
| commit | 8b0ae07969dbdbeb9ad955ab1f23c570ca300167 (patch) | |
| tree | aee8e0f4ee2b5727a97ea61204afbcb95f4bddfb | |
| parent | f2002f729a35df903c4e06373fc966f1cc5b0719 (diff) | |
| download | scummvm-rg350-8b0ae07969dbdbeb9ad955ab1f23c570ca300167.tar.gz scummvm-rg350-8b0ae07969dbdbeb9ad955ab1f23c570ca300167.tar.bz2 scummvm-rg350-8b0ae07969dbdbeb9ad955ab1f23c570ca300167.zip | |
HOPKINS: Use common::string instead of hardcoded values in CONSTRUIT_FICHIER
| -rw-r--r-- | engines/hopkins/files.cpp | 8 | ||||
| -rw-r--r-- | engines/hopkins/globals.cpp | 3 | ||||
| -rw-r--r-- | engines/hopkins/globals.h | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp index daa618d7c2..bc523af254 100644 --- a/engines/hopkins/files.cpp +++ b/engines/hopkins/files.cpp @@ -143,19 +143,19 @@ void FileManager::CONSTRUIT_FICHIER(const Common::String &folder, const Common:: // check for animations that don't exist in the ANM folder, but rather in special // sub-folders depending on the physical screen resolution being used. - if (folder == "ANM") { + if (folder == _vm->_globals.HOPANM) { switch (_vm->_globals.SVGA) { case 1: if (TEST_REP(folderToUse, file)) - folderToUse = "TSVGA"; + folderToUse = _vm->_globals.HOPTSVGA; break; case 2: if (TEST_REP(folderToUse, file)) - folderToUse = "SVGA"; + folderToUse = _vm->_globals.HOPSVGA; break; case 3: if (TEST_REP(folderToUse, file)) - folderToUse = "VGA"; + folderToUse = _vm->_globals.HOPVGA; break; default: break; diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp index ef400b7865..2283c6b10a 100644 --- a/engines/hopkins/globals.cpp +++ b/engines/hopkins/globals.cpp @@ -296,6 +296,9 @@ void Globals::setConfig() { HOPMUSIC = "MUSIC"; HOPVOICE = "VOICE"; HOPANM = "ANM"; + HOPTSVGA = "TSVGA"; + HOPSVGA = "SVGA"; + HOPVGA = "VGA"; HOPSEQ = "SEQ"; // CHECKME: Should be in Globals() but it doesn't work diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h index f9d2b0c05e..382487a822 100644 --- a/engines/hopkins/globals.h +++ b/engines/hopkins/globals.h @@ -343,6 +343,9 @@ public: Common::String HOPMUSIC; Common::String HOPVOICE; Common::String HOPANM; + Common::String HOPTSVGA; + Common::String HOPSVGA; + Common::String HOPVGA; Common::String HOPSEQ; Common::String FICH_ZONE; Common::String FICH_TEXTE; |