diff options
| author | Strangerke | 2013-02-27 00:15:54 +0100 |
|---|---|---|
| committer | Strangerke | 2013-02-27 00:15:54 +0100 |
| commit | 58eefc0833a540213298f75e87222b12831dd1f7 (patch) | |
| tree | 50641a8b7ed9182612be5f72ce3edad317b20736 /engines/hopkins/objects.cpp | |
| parent | c74361b0b63e315597ff8c83704f379726558166 (diff) | |
| download | scummvm-rg350-58eefc0833a540213298f75e87222b12831dd1f7.tar.gz scummvm-rg350-58eefc0833a540213298f75e87222b12831dd1f7.tar.bz2 scummvm-rg350-58eefc0833a540213298f75e87222b12831dd1f7.zip | |
HOPKINS: Get rid of magic values in FilesManager
Diffstat (limited to 'engines/hopkins/objects.cpp')
| -rw-r--r-- | engines/hopkins/objects.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index f6c057b7d3..836fc0df0f 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -2535,7 +2535,7 @@ void ObjectsManager::OPTI_OBJET() { int lastOpcodeResult = 1; file = "OBJET1.ini"; - data = _vm->_fileManager.searchCat(file, 1); + data = _vm->_fileManager.searchCat(file, RES_INI); if (data == g_PTRNUL) { data = _vm->_fileManager.loadFile(file); if (data == g_PTRNUL) @@ -3047,7 +3047,7 @@ int ObjectsManager::getBobFrameIndex(int idx) { void ObjectsManager::loadLinkFile(const Common::String &file) { Common::File f; Common::String filename = file + ".LNK"; - byte *ptr = _vm->_fileManager.searchCat(filename, 3); + byte *ptr = _vm->_fileManager.searchCat(filename, RES_LIN); size_t nbytes = _vm->_globals._catalogSize; if (ptr == g_PTRNUL) { if (!f.open(filename)) @@ -3068,7 +3068,7 @@ void ObjectsManager::loadLinkFile(const Common::String &file) { Common::String filename2 = Common::String((const char *)ptr + 1000); if (!filename2.empty()) { - _vm->_globals._hidingItemData[1] = _vm->_fileManager.searchCat(filename2, 8); + _vm->_globals._hidingItemData[1] = _vm->_fileManager.searchCat(filename2, RES_SLI); if (_vm->_globals._hidingItemData[1] || _vm->_globals._hidingItemData[1] == g_PTRNUL) { _vm->_globals._hidingItemData[1] = _vm->_fileManager.loadFile(filename2); |