diff options
| author | Strangerke | 2013-01-07 23:56:39 +0100 |
|---|---|---|
| committer | Strangerke | 2013-01-08 00:03:08 +0100 |
| commit | 495ecaafbcf1620901d270a65394ca312f2b5a37 (patch) | |
| tree | 81973080b68ae9f8c1af67320b0cd3554373deb2 /engines/hopkins/talk.cpp | |
| parent | 337c5d0e8d5d3f7fe20150aff0ee1703dc230455 (diff) | |
| download | scummvm-rg350-495ecaafbcf1620901d270a65394ca312f2b5a37.tar.gz scummvm-rg350-495ecaafbcf1620901d270a65394ca312f2b5a37.tar.bz2 scummvm-rg350-495ecaafbcf1620901d270a65394ca312f2b5a37.zip | |
HOPKINS: Remove global filename and constructFilename
Diffstat (limited to 'engines/hopkins/talk.cpp')
| -rw-r--r-- | engines/hopkins/talk.cpp | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp index 3d00c441fd..ff4642c18e 100644 --- a/engines/hopkins/talk.cpp +++ b/engines/hopkins/talk.cpp @@ -62,9 +62,8 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) { _characterBuffer = _vm->_fileManager.searchCat(filename, 5); _characterSize = _vm->_globals._catalogSize; if (_characterBuffer == g_PTRNUL) { - _vm->_fileManager.constructFilename("ANIM", filename); - _characterBuffer = _vm->_fileManager.loadFile(_vm->_globals._curFilename); - _characterSize = _vm->_fileManager.fileSize(_vm->_globals._curFilename); + _characterBuffer = _vm->_fileManager.loadFile(filename); + _characterSize = _vm->_fileManager.fileSize(filename); } _vm->_globals._saveData->data[svField4] = 0; getStringFromBuffer(40, spriteFilename, (const char *)_characterBuffer); @@ -81,17 +80,15 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) { _paletteBufferIdx = 20 * (int16)READ_LE_UINT16((uint16 *)_characterBuffer + 42) + 110; _characterSprite = _vm->_fileManager.searchCat(spriteFilename, 7); if (_characterSprite) { - _vm->_fileManager.constructFilename("ANIM", spriteFilename); + _characterSprite = _vm->_objectsManager.loadSprite(spriteFilename); } else { - _vm->_fileManager.constructFilename("ANIM", "RES_SAN.RES"); + _characterSprite = _vm->_objectsManager.loadSprite("RES_SAN.RES"); } - _characterSprite = _vm->_objectsManager.loadSprite(_vm->_globals._curFilename); - _vm->_fileManager.constructLinuxFilename("TEMP.SCR"); if (_vm->_graphicsManager._lineNbr == SCREEN_WIDTH) - _vm->_saveLoadManager.saveFile(_vm->_globals._curFilename, _vm->_graphicsManager._vesaScreen, 307200); + _vm->_saveLoadManager.saveFile("TEMP.SCR", _vm->_graphicsManager._vesaScreen, 307200); else if (_vm->_graphicsManager._lineNbr == (SCREEN_WIDTH * 2)) - _vm->_saveLoadManager.saveFile(_vm->_globals._curFilename, _vm->_graphicsManager._vesaScreen, 614400); + _vm->_saveLoadManager.saveFile("TEMP.SCR", _vm->_graphicsManager._vesaScreen, 614400); if (!_vm->_graphicsManager._lineNbr) _vm->_graphicsManager._scrollOffset = 0; @@ -163,9 +160,8 @@ void TalkManager::PARLER_PERSO2(const Common::String &filename) { _characterBuffer = _vm->_fileManager.searchCat(filename, 5); _characterSize = _vm->_globals._catalogSize; if (_characterBuffer == g_PTRNUL) { - _vm->_fileManager.constructFilename("ANIM", filename); - _characterBuffer = _vm->_fileManager.loadFile(_vm->_globals._curFilename); - _characterSize = _vm->_fileManager.fileSize(_vm->_globals._curFilename); + _characterBuffer = _vm->_fileManager.loadFile(filename); + _characterSize = _vm->_fileManager.fileSize(filename); } _vm->_globals._saveData->data[svField4] = 0; @@ -576,10 +572,9 @@ int TalkManager::VERIF_BOITE(int idx, const Common::String &file, int a3) { v18 = 0; _vm->_globals.police_l = 11; - _vm->_fileManager.constructFilename("LINK", file); // Build up the filename - filename = dest = _vm->_globals._curFilename; + filename = dest = file; while (filename.lastChar() != '.') filename.deleteLastChar(); filename += "IND"; @@ -1087,9 +1082,8 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) { _characterBuffer = _vm->_fileManager.searchCat(a2, 5); _characterSize = _vm->_globals._catalogSize; if (_characterBuffer == g_PTRNUL) { - _vm->_fileManager.constructFilename("ANIM", a2); - _characterBuffer = _vm->_fileManager.loadFile(_vm->_globals._curFilename); - _characterSize = _vm->_fileManager.fileSize(_vm->_globals._curFilename); + _characterBuffer = _vm->_fileManager.loadFile(a2); + _characterSize = _vm->_fileManager.fileSize(a2); } getStringFromBuffer(40, v23, (const char *)_characterBuffer); getStringFromBuffer(0, v22, (const char *)_characterBuffer); @@ -1100,17 +1094,14 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) { _characterSprite = _vm->_fileManager.searchCat(v23, 7); if (_characterSprite) - _vm->_fileManager.constructFilename("ANIM", v23); + _characterSprite = _vm->_objectsManager.loadSprite(v23); else - _vm->_fileManager.constructFilename("ANIM", "RES_SAN.RES"); + _characterSprite = _vm->_objectsManager.loadSprite("RES_SAN.RES"); - _characterSprite = _vm->_objectsManager.loadSprite(_vm->_globals._curFilename); - - _vm->_fileManager.constructLinuxFilename("TEMP.SCR"); if (_vm->_graphicsManager._lineNbr == SCREEN_WIDTH) - _vm->_saveLoadManager.saveFile(_vm->_globals._curFilename, _vm->_graphicsManager._vesaScreen, 307200); + _vm->_saveLoadManager.saveFile("TEMP.SCR", _vm->_graphicsManager._vesaScreen, 307200); else if (_vm->_graphicsManager._lineNbr == (SCREEN_WIDTH * 2)) - _vm->_saveLoadManager.saveFile(_vm->_globals._curFilename, _vm->_graphicsManager._vesaScreen, 614400); + _vm->_saveLoadManager.saveFile("TEMP.SCR", _vm->_graphicsManager._vesaScreen, 614400); if (!_vm->_graphicsManager._lineNbr) _vm->_graphicsManager._scrollOffset = 0; |