diff options
author | Strangerke | 2014-03-03 19:00:14 +0100 |
---|---|---|
committer | Strangerke | 2014-03-03 19:00:14 +0100 |
commit | 6db1e8ae460e61844ee95579982da7d430935203 (patch) | |
tree | ffd6290c18dd96181de257bf375a210be936f596 /engines/voyeur/files.cpp | |
parent | 834cd6cc50da6406db5de94206ab5a26f781f2aa (diff) | |
download | scummvm-rg350-6db1e8ae460e61844ee95579982da7d430935203.tar.gz scummvm-rg350-6db1e8ae460e61844ee95579982da7d430935203.tar.bz2 scummvm-rg350-6db1e8ae460e61844ee95579982da7d430935203.zip |
VOYEUR: Simplify getBoltGroup() by removing the second (useless) parameter
Diffstat (limited to 'engines/voyeur/files.cpp')
-rw-r--r-- | engines/voyeur/files.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp index 1c3a797aca..71ef15cd52 100644 --- a/engines/voyeur/files.cpp +++ b/engines/voyeur/files.cpp @@ -239,7 +239,7 @@ BoltFile::~BoltFile() { _state._curLibPtr = NULL; } -BoltGroup *BoltFile::getBoltGroup(uint16 id, bool process) { +BoltGroup *BoltFile::getBoltGroup(uint16 id) { _state._curLibPtr = this; _state._curGroupPtr = &_groups[(id >> 8) & 0xff]; @@ -248,16 +248,11 @@ BoltGroup *BoltFile::getBoltGroup(uint16 id, bool process) { _state._curGroupPtr->load(id & 0xff00); } - if (process) { - // Pre-process the resources - id &= 0xff00; - for (int idx = 0; idx < _state._curGroupPtr->_count; ++idx, ++id) { - byte *member = getBoltMember(id); - assert(member); - } - } else if (!_state._curGroupPtr->_processed) { - _state._curGroupPtr->_processed = true; - _state._curGroupPtr->load(id & 0xff00); + // Pre-process the resources + id &= 0xff00; + for (int idx = 0; idx < _state._curGroupPtr->_count; ++idx, ++id) { + byte *member = getBoltMember(id); + assert(member); } resolveAll(); |