thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add flObject lock/unlock support for HE games.

Browse source 
svn-id: r17474
This commit is contained in:
Travis Howell 2005-04-09 09:57:54 +00:00
parent 866e0c8613
commit db43946f05
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
scumm/script_v7he.cpp
View file

@ -510,10 +510,11 @@ void ScummEngine_v70he::o70_getActorRoom() {
} }
void ScummEngine_v70he::o70_resourceRoutines() { void ScummEngine_v70he::o70_resourceRoutines() {
int resid, op; int objidx, resid, subOp;
op = fetchScriptByte();
switch (op) { subOp = fetchScriptByte();
switch (subOp) {
case 100: // SO_LOAD_SCRIPT case 100: // SO_LOAD_SCRIPT
resid = pop(); resid = pop();
ensureResourceLoaded(rtScript, resid); ensureResourceLoaded(rtScript, resid);
@ -607,7 +608,7 @@ void ScummEngine_v70he::o70_resourceRoutines() {
case 122: case 122:
case 123: case 123:
case 203: case 203:
debug(5,"stub queueload (%d) resource %d", op, pop()); debug(5,"stub queueload (%d) resource %d", subOp, pop());
break; break;
case 159: case 159:
resid = pop(); resid = pop();
@ -627,17 +628,25 @@ void ScummEngine_v70he::o70_resourceRoutines() {
break; break;
case 233: case 233:
resid = pop(); resid = pop();
debug(5,"stub o70_resourceRoutines lock object %d", resid); objidx = getObjectIndex(resid);
if (objidx == -1)
break;
res.lock(rtFlObject, _objs[objidx].fl_object_index);
debug(0,"stub o70_resourceRoutines lock object %d", resid);
break; break;
case 235: case 235:
resid = pop(); resid = pop();
debug(5,"stub o70_resourceRoutines unlock object %d", resid); objidx = getObjectIndex(resid);
if (objidx == -1)
break;
res.unlock(rtFlObject, _objs[objidx].fl_object_index);
debug(0,"stub o70_resourceRoutines unlock object %d", resid);
break; break;
case 239: case 239:
// Used in airport // Used in airport
break; break;
default: default:
debug(1,"o70_resourceRoutines: default case %d", op); debug(1,"o70_resourceRoutines: default case %d", subOp);
} }
} }

4
scumm/script_v8.cpp
View file

@ -1214,13 +1214,13 @@ void ScummEngine_v8::o8_kernelSetFunctions() {
case 11: { // lockObject case 11: { // lockObject
int objidx = getObjectIndex(args[1]); int objidx = getObjectIndex(args[1]);
assert(objidx != -1); assert(objidx != -1);
res.lock(rtFlObject, objidx); res.lock(rtFlObject, _objs[objidx].fl_object_index);
break; break;
} }
case 12: { // unlockObject case 12: { // unlockObject
int objidx = getObjectIndex(args[1]); int objidx = getObjectIndex(args[1]);
assert(objidx != -1); assert(objidx != -1);
res.unlock(rtFlObject, objidx); res.unlock(rtFlObject, _objs[objidx].fl_object_index);
break; break;
} }
case 13: // remapCostume case 13: // remapCostume