diff options
| author | Matthew Hoops | 2011-05-18 18:23:37 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-18 18:23:37 -0400 |
| commit | d4c92983920cfe3b25a22d91e12c750e591b917e (patch) | |
| tree | c0b63318b9ba0e67528337cfaa21515def1c3962 /engines/scumm/he/script_v72he.cpp | |
| parent | 7e2edf16b3e2bf1d2b31999979a60802514df6cb (diff) | |
| parent | cf107e24be28c7e6db65b5c7ffed120af4a7994b (diff) | |
| download | scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.tar.gz scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.tar.bz2 scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/scumm/he/script_v72he.cpp')
| -rw-r--r-- | engines/scumm/he/script_v72he.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index 17bd29d826..8f16bf0f3a 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifdef ENABLE_HE @@ -624,15 +621,15 @@ void ScummEngine_v72he::o72_getArrayDimSize() { } void ScummEngine_v72he::o72_getNumFreeArrays() { - byte **addr = _res->address[rtString]; + const ResourceManager::ResTypeData &rtd = _res->_types[rtString]; int i, num = 0; for (i = 1; i < _numArray; i++) { - if (!addr[i]) + if (!rtd[i]._address) num++; } - push (num); + push(num); } void ScummEngine_v72he::o72_roomOps() { @@ -1914,7 +1911,8 @@ void ScummEngine_v72he::o72_writeINI() { void ScummEngine_v72he::o72_getResourceSize() { const byte *ptr; - int size, type; + int size; + ResType type; int resid = pop(); if (_game.heversion == 72) { @@ -1926,7 +1924,7 @@ void ScummEngine_v72he::o72_getResourceSize() { switch (subOp) { case 13: - push (getSoundResourceSize(resid)); + push(getSoundResourceSize(resid)); return; case 14: type = rtRoomImage; |