[Scummvm-cvs-logs] scummvm master -> 6db1e8ae460e61844ee95579982da7d430935203

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6db1e8ae46 VOYEUR: Simplify getBoltGroup() by removing the second (useless) parameter


Commit: 6db1e8ae460e61844ee95579982da7d430935203
    https://github.com/scummvm/scummvm/commit/6db1e8ae460e61844ee95579982da7d430935203
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-03T10:00:14-08:00

Commit Message:
VOYEUR: Simplify getBoltGroup() by removing the second (useless) parameter

Changed paths:
    engines/voyeur/files.cpp
    engines/voyeur/files.h



diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index 1c3a797..71ef15c 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 dc409df..51194e0 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);