diff options
author | Max Horn | 2006-09-17 20:36:48 +0000 |
---|---|---|
committer | Max Horn | 2006-09-17 20:36:48 +0000 |
commit | 51017cf1b21f450acad9c735e9364f5bb5d35f17 (patch) | |
tree | c61007341218b4522350f23cf646a2376b0bf3be /engines/scumm/verbs.cpp | |
parent | 8c0b0c012007d938ab500c5ccc64f6e0cbcf13e0 (diff) | |
download | scummvm-rg350-51017cf1b21f450acad9c735e9364f5bb5d35f17.tar.gz scummvm-rg350-51017cf1b21f450acad9c735e9364f5bb5d35f17.tar.bz2 scummvm-rg350-51017cf1b21f450acad9c735e9364f5bb5d35f17.zip |
Renamed ScummEngine::res to _res and allocate the ResourceManager on the heap (i.e. _res is a pointer now)
svn-id: r23922
Diffstat (limited to 'engines/scumm/verbs.cpp')
-rw-r--r-- | engines/scumm/verbs.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp index a93cc83354..55232a9fd8 100644 --- a/engines/scumm/verbs.cpp +++ b/engines/scumm/verbs.cpp @@ -882,7 +882,7 @@ void ScummEngine::killVerb(int slot) { vs->verbid = 0; vs->curmode = 0; - res.nukeResource(rtVerb, slot); + _res->nukeResource(rtVerb, slot); if (_game.version <= 6 && vs->saveid == 0) { drawVerb(slot, 0); @@ -910,7 +910,7 @@ void ScummEngine::setVerbObject(uint room, uint object, uint verb) { if (_objs[i].obj_nr == object) { findObjectInRoom(&foir, foImageHeader, object, room); size = READ_LE_UINT16(foir.obim); - byte *ptr = res.createResource(rtVerb, verb, size + 2); + byte *ptr = _res->createResource(rtVerb, verb, size + 2); obcdptr = getResourceAddress(rtRoom, room) + getOBCDOffs(object); ptr[0] = *(obcdptr + 9); // Width ptr[1] = *(obcdptr + 15); // Height @@ -929,7 +929,7 @@ void ScummEngine::setVerbObject(uint room, uint object, uint verb) { size = READ_LE_UINT32(foir.obim); obcdptr = getResourceAddress(rtRoom, room) + getOBCDOffs(object); size2 = READ_LE_UINT32(obcdptr); - res.createResource(rtVerb, verb, size + size2); + _res->createResource(rtVerb, verb, size + size2); obimptr = getResourceAddress(rtRoom, room) - foir.roomptr + foir.obim; obcdptr = getResourceAddress(rtRoom, room) + getOBCDOffs(object); memcpy(getResourceAddress(rtVerb, verb), obimptr, size); @@ -940,7 +940,7 @@ void ScummEngine::setVerbObject(uint room, uint object, uint verb) { } else { findObjectInRoom(&foir, foImageHeader, object, room); size = READ_BE_UINT32(foir.obim + 4); - res.createResource(rtVerb, verb, size); + _res->createResource(rtVerb, verb, size); obimptr = getResourceAddress(rtRoom, room) - foir.roomptr + foir.obim; memcpy(getResourceAddress(rtVerb, verb), obimptr, size); } |