diff options
| author | Strangerke | 2012-12-09 20:22:12 +0100 |
|---|---|---|
| committer | Strangerke | 2012-12-09 20:22:12 +0100 |
| commit | 867cbbf4ff6ddfca826724a7ff74f44a06e8d044 (patch) | |
| tree | 597fe707ae53fbd0b3a73e9d3215b51aac261228 /engines/hopkins/globals.cpp | |
| parent | fedf2ca70f7d38e0b49adec8b61b0a6b464b9929 (diff) | |
| download | scummvm-rg350-867cbbf4ff6ddfca826724a7ff74f44a06e8d044.tar.gz scummvm-rg350-867cbbf4ff6ddfca826724a7ff74f44a06e8d044.tar.bz2 scummvm-rg350-867cbbf4ff6ddfca826724a7ff74f44a06e8d044.zip | |
HOPKINS: Refactor fileManager
Diffstat (limited to 'engines/hopkins/globals.cpp')
| -rw-r--r-- | engines/hopkins/globals.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp index e4a405ef0c..a311c91253 100644 --- a/engines/hopkins/globals.cpp +++ b/engines/hopkins/globals.cpp @@ -301,6 +301,7 @@ void Globals::setConfig() { HOPSVGA = "SVGA"; HOPVGA = "VGA"; HOPSEQ = "SEQ"; + HOPSYSTEM = "SYSTEM"; // CHECKME: Should be in Globals() but it doesn't work // The Polish version is a translation of the English version. The filenames are the same. @@ -490,8 +491,8 @@ void Globals::CLEAR_VBOB() { // Load Object void Globals::CHARGE_OBJET() { - _vm->_fileManager.CONSTRUIT_SYSTEM("OBJET.DAT"); - byte *data = _vm->_fileManager.CHARGE_FICHIER(NFICHIER); + _vm->_fileManager.constructFilename(HOPSYSTEM, "OBJET.DAT"); + byte *data = _vm->_fileManager.loadFile(NFICHIER); byte *srcP = data; for (int idx = 0; idx < 300; ++idx) { @@ -580,14 +581,14 @@ void Globals::CHARGE_CACHE(const Common::String &file) { Common::File f; RESET_CACHE(); - _vm->_fileManager.CONSTRUIT_FICHIER(HOPLINK, file); - ptr = _vm->_fileManager.CHARGE_FICHIER(NFICHIER); + _vm->_fileManager.constructFilename(HOPLINK, file); + ptr = _vm->_fileManager.loadFile(NFICHIER); v16 = Common::String((const char *)ptr); - _vm->_fileManager.CONSTRUIT_FICHIER(HOPLINK, v16); + _vm->_fileManager.constructFilename(HOPLINK, v16); if (f.exists(NFICHIER)) { - spriteData = _vm->_fileManager.CHARGE_FICHIER(NFICHIER); + spriteData = _vm->_fileManager.loadFile(NFICHIER); CACHE_BANQUE[1] = spriteData; int v15 = 60; for (int i = 0; i <= 21; i++) { |