diff options
| author | Max Horn | 2003-12-26 23:11:35 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-26 23:11:35 +0000 |
| commit | e3e6bb3191f57179874447b4f264721a2bc8a128 (patch) | |
| tree | 79599fadda78269c8031aae733574aff65194899 /scumm/resource.cpp | |
| parent | 706d2f1e5a978c507666f6669aa3e21fc095a82a (diff) | |
| download | scummvm-rg350-e3e6bb3191f57179874447b4f264721a2bc8a128.tar.gz scummvm-rg350-e3e6bb3191f57179874447b4f264721a2bc8a128.tar.bz2 scummvm-rg350-e3e6bb3191f57179874447b4f264721a2bc8a128.zip | |
got rid of those _maxFOO macros, replaced them by access to the equivalent _numFOO variables
svn-id: r11953
Diffstat (limited to 'scumm/resource.cpp')
| -rw-r--r-- | scumm/resource.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index a36c557e20..33960aedcd 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -163,7 +163,7 @@ void ScummEngine::deleteRoomOffsets() { if (!(_features & GF_SMALL_HEADER) && !_dynamicRoomOffsets) return; - for (int i = 0; i < _maxRooms; i++) { + for (int i = 0; i < _numRooms; i++) { if (_roomFileOffsets[i] != 0xFFFFFFFF) _roomFileOffsets[i] = 0; } @@ -559,7 +559,7 @@ void ScummEngine::loadCharset(int no) { no = 1; assert(no < (int)sizeof(_charsetData) / 16); - checkRange(_maxCharsets - 1, 1, no, "Loading illegal charset %d"); + checkRange(_numCharsets - 1, 1, no, "Loading illegal charset %d"); // ensureResourceLoaded(rtCharset, no); ptr = getResourceAddress(rtCharset, no); @@ -572,7 +572,7 @@ void ScummEngine::loadCharset(int no) { } void ScummEngine::nukeCharset(int i) { - checkRange(_maxCharsets - 1, 1, i, "Nuking illegal charset %d"); + checkRange(_numCharsets - 1, 1, i, "Nuking illegal charset %d"); nukeResource(rtCharset, i); } |