aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/room.cpp
diff options
context:
space:
mode:
authorMax Horn2011-05-11 18:11:37 +0200
committerMax Horn2011-05-13 11:47:11 +0200
commit0342ab3f1b2d67de6fa0112311b973b55d509f1c (patch)
tree67549fd86477bc6ee1fa7d1c26cca38664f41153 /engines/scumm/room.cpp
parent75b9deb1856bae8355403faa5f55857f3929adb6 (diff)
downloadscummvm-rg350-0342ab3f1b2d67de6fa0112311b973b55d509f1c.tar.gz
scummvm-rg350-0342ab3f1b2d67de6fa0112311b973b55d509f1c.tar.bz2
scummvm-rg350-0342ab3f1b2d67de6fa0112311b973b55d509f1c.zip
SCUMM: Rename ResTypeData::num to _num
Diffstat (limited to 'engines/scumm/room.cpp')
-rw-r--r--engines/scumm/room.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp
index 7e0f70e2cd..6ff55e26fd 100644
--- a/engines/scumm/room.cpp
+++ b/engines/scumm/room.cpp
@@ -525,14 +525,14 @@ void ScummEngine::resetRoomSubBlocks() {
//
// Load scale data
//
- for (i = 1; i < _res->_types[rtScaleTable].num; i++)
+ for (i = 1; i < _res->_types[rtScaleTable]._num; i++)
_res->nukeResource(rtScaleTable, i);
ptr = findResourceData(MKTAG('S','C','A','L'), roomptr);
if (ptr) {
int s1, s2, y1, y2;
if (_game.version == 8) {
- for (i = 1; i < _res->_types[rtScaleTable].num; i++, ptr += 16) {
+ for (i = 1; i < _res->_types[rtScaleTable]._num; i++, ptr += 16) {
s1 = READ_LE_UINT32(ptr);
y1 = READ_LE_UINT32(ptr + 4);
s2 = READ_LE_UINT32(ptr + 8);
@@ -540,7 +540,7 @@ void ScummEngine::resetRoomSubBlocks() {
setScaleSlot(i, 0, y1, s1, 0, y2, s2);
}
} else {
- for (i = 1; i < _res->_types[rtScaleTable].num; i++, ptr += 8) {
+ for (i = 1; i < _res->_types[rtScaleTable]._num; i++, ptr += 8) {
s1 = READ_LE_UINT16(ptr);
y1 = READ_LE_UINT16(ptr + 2);
s2 = READ_LE_UINT16(ptr + 4);
@@ -794,7 +794,7 @@ void ScummEngine_v3old::resetRoomSubBlocks() {
//
// No scale data in old bundle games
//
- for (i = 1; i < _res->_types[rtScaleTable].num; i++)
+ for (i = 1; i < _res->_types[rtScaleTable]._num; i++)
_res->nukeResource(rtScaleTable, i);
}