aboutsummaryrefslogtreecommitdiff
path: root/engines/voyeur
diff options
context:
space:
mode:
authorStrangerke2014-03-03 19:00:14 +0100
committerStrangerke2014-03-03 19:00:14 +0100
commit6db1e8ae460e61844ee95579982da7d430935203 (patch)
treeffd6290c18dd96181de257bf375a210be936f596 /engines/voyeur
parent834cd6cc50da6406db5de94206ab5a26f781f2aa (diff)
downloadscummvm-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')
-rw-r--r--engines/voyeur/files.cpp17
-rw-r--r--engines/voyeur/files.h2
2 files changed, 7 insertions, 12 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();
diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h
index dc409df320..51194e00fc 100644
--- a/engines/voyeur/files.h
+++ b/engines/voyeur/files.h
@@ -106,7 +106,7 @@ public:
BoltFile(const Common::String &filename, BoltFilesState &state);
virtual ~BoltFile();
- BoltGroup *getBoltGroup(uint16 id, bool process = true);
+ BoltGroup *getBoltGroup(uint16 id);
void freeBoltGroup(uint16 id, bool freeEntries = true);
void freeBoltMember(uint32 id);
byte *memberAddr(uint32 id);