diff options
| author | Matthew Hoops | 2011-06-28 11:58:52 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-06-28 12:10:28 -0400 |
| commit | 71c4329d86566aa6281a4790b08fe8e77d057f10 (patch) | |
| tree | ffca295074195c60c04984a623b5e641b4e044db /engines/mohawk/riven.cpp | |
| parent | ede71596ba43c777d13201757c974aa22fd0e8ec (diff) | |
| download | scummvm-rg350-71c4329d86566aa6281a4790b08fe8e77d057f10.tar.gz scummvm-rg350-71c4329d86566aa6281a4790b08fe8e77d057f10.tar.bz2 scummvm-rg350-71c4329d86566aa6281a4790b08fe8e77d057f10.zip | |
MOHAWK: Rework archive handling
A new base class has been introduced (aptly named "Archive"), which is much cleaner than inheriting from MohawkArchive. In addition, the underlying resource retrieving code has been merged to reduce dupliplication.
Diffstat (limited to 'engines/mohawk/riven.cpp')
| -rw-r--r-- | engines/mohawk/riven.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index 8f8bc15990..612b8b3685 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -143,7 +143,7 @@ Common::Error MohawkEngine_Riven::run() { _extrasFile = new MohawkArchive(); // We need extras.mhk for inventory images, marble images, and credits images - if (!_extrasFile->open("extras.mhk")) { + if (!_extrasFile->openFile("extras.mhk")) { Common::String message = "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also works."; GUIErrorMessage(message); warning("%s", message.c_str()); @@ -317,7 +317,7 @@ void MohawkEngine_Riven::changeToStack(uint16 n) { Common::String filename = Common::String(prefix) + endings[i]; MohawkArchive *mhk = new MohawkArchive(); - if (mhk->open(filename)) + if (mhk->openFile(filename)) _mhk.push_back(mhk); else delete mhk; |