From bd865d9741878b56a86c1389e66dfdee24ba1e39 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Mon, 7 Jan 2013 16:17:27 +0200 Subject: HOPKINS: Remove static game directory configuration options Also, remove the unused VGA folder. This is the first step to remove constructFilename() and associated functions. --- engines/hopkins/anim.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'engines/hopkins/anim.cpp') diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp index 302c2f7913..1630de3fe7 100644 --- a/engines/hopkins/anim.cpp +++ b/engines/hopkins/anim.cpp @@ -58,7 +58,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui byte *screenP = _vm->_graphicsManager._vesaScreen; byte *ptr = _vm->_globals.allocMemory(20); - _vm->_fileManager.constructFilename(_vm->_globals.HOPANM, filename); + _vm->_fileManager.constructFilename("ANM", filename); if (!f.open(_vm->_globals._curFilename)) error("File not found - %s", _vm->_globals._curFilename.c_str()); @@ -233,7 +233,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 a2, uint screenP = _vm->_graphicsManager._vesaScreen; ptr = _vm->_globals.allocMemory(20); - _vm->_fileManager.constructFilename(_vm->_globals.HOPANM, filename); + _vm->_fileManager.constructFilename("ANM", filename); if (!f.open(_vm->_globals._curFilename)) error("Error opening file - %s", _vm->_globals._curFilename.c_str()); @@ -470,7 +470,7 @@ void AnimationManager::loadAnim(const Common::String &animName) { clearAnim(); Common::String filename = animName + ".ANI"; - _vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, filename); + _vm->_fileManager.constructFilename("ANIM", filename); Common::File f; if (!f.open(_vm->_globals._curFilename)) @@ -495,7 +495,7 @@ void AnimationManager::loadAnim(const Common::String &animName) { for (int idx = 0; idx <= 5; ++idx) { if (files[idx][0]) { - _vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, files[idx]); + _vm->_fileManager.constructFilename("ANIM", files[idx]); if (!f.exists(_vm->_globals._curFilename)) error("File not found"); @@ -539,7 +539,7 @@ int AnimationManager::loadSpriteBank(int idx, const Common::String &filename) { byte *v13; byte *v19; int result = 0; - _vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, filename); + _vm->_fileManager.constructFilename("ANIM", filename); _vm->_globals.Bank[idx].field1C = _vm->_fileManager.fileSize(_vm->_globals._curFilename); _vm->_globals.Bank[idx]._loadedFl = true; _vm->_globals.Bank[idx]._filename = filename; @@ -581,7 +581,7 @@ int AnimationManager::loadSpriteBank(int idx, const Common::String &filename) { } while (ch != '.'); ofsFilename += ".OFS"; - _vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, ofsFilename); + _vm->_fileManager.constructFilename("ANIM", ofsFilename); Common::File f; if (f.exists(_vm->_globals._curFilename)) { v19 = _vm->_fileManager.loadFile(_vm->_globals._curFilename); @@ -727,7 +727,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui } screenP = _vm->_graphicsManager._vesaScreen; v10 = _vm->_globals.allocMemory(22); - _vm->_fileManager.constructFilename(_vm->_globals.HOPSEQ, file); + _vm->_fileManager.constructFilename("SEQ", file); if (!f.open(_vm->_globals._curFilename)) error("Error opening file - %s", _vm->_globals._curFilename.c_str()); @@ -883,7 +883,7 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u _vm->_eventsManager._mouseFl = false; screenP = _vm->_graphicsManager._vesaScreen; v11 = _vm->_globals.allocMemory(22); - _vm->_fileManager.constructFilename(_vm->_globals.HOPSEQ, file); + _vm->_fileManager.constructFilename("SEQ", file); if (!f.open(_vm->_globals._curFilename)) error("File not found - %s", _vm->_globals._curFilename.c_str()); -- cgit v1.2.3