diff options
| author | Strangerke | 2012-12-28 08:26:27 +0100 |
|---|---|---|
| committer | Strangerke | 2012-12-28 08:26:27 +0100 |
| commit | c9343637902ed94f0a511ff9fa0d1bffe346d5e3 (patch) | |
| tree | 2458f1fedfc81076be5caac2b207560343e9f636 /engines/hopkins/talk.cpp | |
| parent | c07beb64455b3d30300176a99aed7140c0a090e0 (diff) | |
| download | scummvm-rg350-c9343637902ed94f0a511ff9fa0d1bffe346d5e3.tar.gz scummvm-rg350-c9343637902ed94f0a511ff9fa0d1bffe346d5e3.tar.bz2 scummvm-rg350-c9343637902ed94f0a511ff9fa0d1bffe346d5e3.zip | |
HOPKINS: Some more renaming and refactoring
Diffstat (limited to 'engines/hopkins/talk.cpp')
| -rw-r--r-- | engines/hopkins/talk.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp index 4bdc0d567d..9a28adbd8f 100644 --- a/engines/hopkins/talk.cpp +++ b/engines/hopkins/talk.cpp @@ -69,8 +69,8 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) { _characterSize = _vm->_globals._catalogSize; if (_characterBuffer == g_PTRNUL) { _vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, filename); - _characterBuffer = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER); - _characterSize = _vm->_fileManager.fileSize(_vm->_globals.NFICHIER); + _characterBuffer = _vm->_fileManager.loadFile(_vm->_globals._curFilename); + _characterSize = _vm->_fileManager.fileSize(_vm->_globals._curFilename); } _vm->_globals._saveData->data[svField4] = 0; getStringFromBuffer(40, spriteFilename, (const char *)_characterBuffer); @@ -91,13 +91,13 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) { } else { _vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, "RES_SAN.RES"); } - _characterSprite = _vm->_objectsManager.loadSprite(_vm->_globals.NFICHIER); + _characterSprite = _vm->_objectsManager.loadSprite(_vm->_globals._curFilename); _vm->_fileManager.constructLinuxFilename("TEMP.SCR"); if (_vm->_graphicsManager._lineNbr == SCREEN_WIDTH) - _vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 307200); + _vm->_saveLoadManager.saveFile(_vm->_globals._curFilename, _vm->_graphicsManager._vesaScreen, 307200); else if (_vm->_graphicsManager._lineNbr == (SCREEN_WIDTH * 2)) - _vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 614400); + _vm->_saveLoadManager.saveFile(_vm->_globals._curFilename, _vm->_graphicsManager._vesaScreen, 614400); if (!_vm->_graphicsManager._lineNbr) _vm->_graphicsManager.ofscroll = 0; @@ -178,8 +178,8 @@ void TalkManager::PARLER_PERSO2(const Common::String &filename) { _characterSize = _vm->_globals._catalogSize; if (_characterBuffer == g_PTRNUL) { _vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, filename); - _characterBuffer = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER); - _characterSize = _vm->_fileManager.fileSize(_vm->_globals.NFICHIER); + _characterBuffer = _vm->_fileManager.loadFile(_vm->_globals._curFilename); + _characterSize = _vm->_fileManager.fileSize(_vm->_globals._curFilename); } _vm->_globals._saveData->data[svField4] = 0; @@ -597,7 +597,7 @@ int TalkManager::VERIF_BOITE(int idx, const Common::String &file, int a3) { _vm->_fileManager.constructFilename(_vm->_globals.HOPLINK, file); // Build up the filename - filename = dest = _vm->_globals.NFICHIER; + filename = dest = _vm->_globals._curFilename; while (filename.lastChar() != '.') filename.deleteLastChar(); filename += "IND"; @@ -1119,8 +1119,8 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) { _characterSize = _vm->_globals._catalogSize; if (_characterBuffer == g_PTRNUL) { _vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, a2); - _characterBuffer = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER); - _characterSize = _vm->_fileManager.fileSize(_vm->_globals.NFICHIER); + _characterBuffer = _vm->_fileManager.loadFile(_vm->_globals._curFilename); + _characterSize = _vm->_fileManager.fileSize(_vm->_globals._curFilename); } getStringFromBuffer(40, v23, (const char *)_characterBuffer); getStringFromBuffer(0, v22, (const char *)_characterBuffer); @@ -1136,13 +1136,13 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) { else _vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, "RES_SAN.RES"); - _characterSprite = _vm->_objectsManager.loadSprite(_vm->_globals.NFICHIER); + _characterSprite = _vm->_objectsManager.loadSprite(_vm->_globals._curFilename); _vm->_fileManager.constructLinuxFilename("TEMP.SCR"); if (_vm->_graphicsManager._lineNbr == SCREEN_WIDTH) - _vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 307200); + _vm->_saveLoadManager.saveFile(_vm->_globals._curFilename, _vm->_graphicsManager._vesaScreen, 307200); else if (_vm->_graphicsManager._lineNbr == (SCREEN_WIDTH * 2)) - _vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 614400); + _vm->_saveLoadManager.saveFile(_vm->_globals._curFilename, _vm->_graphicsManager._vesaScreen, 614400); if (!_vm->_graphicsManager._lineNbr) _vm->_graphicsManager.ofscroll = 0; |