aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2013-05-22 21:43:26 +1000
committerPaul Gilbert2013-05-22 21:43:26 +1000
commitd4a137528f17ef16d0d1ff703afcdfa7c71172ed (patch)
treead562e2d9fb6d8dd6cf20fb7c1612ec8e7c8c2ee
parent7c85f94a57e74cdac6193db043fc9233f3fa6905 (diff)
downloadscummvm-rg350-d4a137528f17ef16d0d1ff703afcdfa7c71172ed.tar.gz
scummvm-rg350-d4a137528f17ef16d0d1ff703afcdfa7c71172ed.tar.bz2
scummvm-rg350-d4a137528f17ef16d0d1ff703afcdfa7c71172ed.zip
VOEYUR: Now the font data pointer loads correctly
-rw-r--r--engines/voyeur/files.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index 7d6a11e2d3..ca54a89074 100644
--- a/engines/voyeur/files.cpp
+++ b/engines/voyeur/files.cpp
@@ -92,7 +92,6 @@ bool BoltFile::getBoltGroup(uint32 id) {
++_fromGroupFlag;
_curLibPtr = this;
_curGroupPtr = &_groups[(id >> 8) & 0xff];
- int count = _curGroupPtr->_count ? _curGroupPtr->_count : 256;
if (!_curGroupPtr->_loaded) {
// Load the group index
@@ -104,7 +103,7 @@ bool BoltFile::getBoltGroup(uint32 id) {
if ((id >> 16) != 0) {
id &= 0xff00;
- for (int idx = 0; idx < count; ++idx, ++id) {
+ for (int idx = 0; idx < _curGroupPtr->_count; ++idx, ++id) {
byte *member = getBoltMember(id);
assert(member);
}
@@ -130,7 +129,7 @@ byte *BoltFile::getBoltMember(uint32 id) {
_curLibPtr = this;
// Get the group, and load it's entry list if not already loaded
- _curGroupPtr = &_groups[(id >> 8) & 0xff << 4];
+ _curGroupPtr = &_groups[(id >> 8) & 0xff];
if (!_curGroupPtr->_loaded)
_curGroupPtr->load();