libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-09 12:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Other v1/v2 resources are invalid, checked again v1 maniac and v1/v2 zak.

Browse Source 
svn-id: r10040
This commit is contained in:
Travis Howell 2003-09-06 08:46:36 +00:00
parent d1c325a8c7
commit 52a59049c7
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scumm/script_v2.cpp
View File

@ -767,11 +767,11 @@ void Scumm_v2::o2_drawObject() {
void Scumm_v2::o2_resourceRoutines() {
const ResTypes resTypes[] = {
rtNumTypes, // Unknown / invalid
rtNumTypes, // Unknown / invalid
rtNumTypes, // Invalid
rtNumTypes, // Invalid
rtCostume,
rtRoom,
rtNumTypes, // Unknown / invalid
rtNumTypes, // Invalid
rtScript,
rtSound
};
@ -782,24 +782,16 @@ void Scumm_v2::o2_resourceRoutines() {
if (0 <= (opcode >> 4) && (opcode >> 4) < (int)ARRAYSIZE(resTypes))
type = resTypes[opcode >> 4];
if (type == rtNumTypes) {
warning("o2_resourceRoutines: unknown restype %d", (opcode >> 4));
if (type == rtNumTypes)
return;
}
if (((opcode & 0x0f) == 0) || ((opcode & 0x0f) == 1)) {
if (opcode & 1) {
ensureResourceLoaded(type, resid);
} else {
// Seems the nuke opcodes do nothing?
warning("o2_resourceRoutines: nuking resType %d, id %d does nothing", type, resid);
}
if ((opcode & 0x0f) == 1) {
ensureResourceLoaded(type, resid);
} else {
if (opcode & 1) {
if (opcode & 1)
lock(type, resid);
} else {
else
unlock(type, resid);
}
}
}