diff options
| author | Max Horn | 2011-05-13 14:12:00 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-13 14:12:00 +0200 |
| commit | 45207a52d480cdd70f6bf08bbad76ec3d23a5688 (patch) | |
| tree | efb201443e11d3a4c1ab6704e13a0f3c92c28975 /engines/scumm/script.cpp | |
| parent | dfd61124039dc04540207a09f7f26e2693599ded (diff) | |
| download | scummvm-rg350-45207a52d480cdd70f6bf08bbad76ec3d23a5688.tar.gz scummvm-rg350-45207a52d480cdd70f6bf08bbad76ec3d23a5688.tar.bz2 scummvm-rg350-45207a52d480cdd70f6bf08bbad76ec3d23a5688.zip | |
SCUMM: Remove ResTypeData::_num
Diffstat (limited to 'engines/scumm/script.cpp')
| -rw-r--r-- | engines/scumm/script.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index 47cf8e024e..6fe80de364 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -397,7 +397,7 @@ void ScummEngine::getScriptBaseAddress() { case WIO_ROOM: /* room script */ if (_game.version == 8) { _scriptOrgPointer = getResourceAddress(rtRoomScripts, _roomResource); - assert(_roomResource < _res->_types[rtRoomScripts]._num); + assert(_roomResource < (int)_res->_types[rtRoomScripts]._resources.size()); _lastCodePtr = &_res->_types[rtRoomScripts]._resources[_roomResource]._address; } else { _scriptOrgPointer = getResourceAddress(rtRoom, _roomResource); @@ -1099,7 +1099,7 @@ void ScummEngine::checkAndRunSentenceScript() { // For now we assume that if there are more than 460 scripts, then // the pair 29/104 is used, else the pair 28/103. - if (_res->_types[rtScript]._num > 460) { + if (_res->_types[rtScript]._resources.size() > 460) { if (sentenceScript == 104) sentenceScript = 29; } else { |