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

Change needed for HE 71 too.

Browse source 
svn-id: r14984
This commit is contained in:
Travis Howell 2004-09-09 14:07:51 +00:00
parent 9eb69ed03a
commit 655728fe7d
5 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scumm/intern.h
View file

@ -731,7 +731,6 @@ protected:
void o72_printWizImage();
void o72_getArrayDimSize();
void o72_getNumFreeArrays();
void o72_pickupObject();
void o72_actorOps();
void o72_verbOps();
void o72_arrayOps();

15
scumm/script_v72he.cpp
View file

@ -210,7 +210,7 @@ void ScummEngine_v72he::setupOpcodes() {
OPCODE(o6_animateActor),
OPCODE(o6_doSentence),
/* 84 */
OPCODE(o72_pickupObject),
OPCODE(o7_pickupObject),
OPCODE(o6_loadRoomWithEgo),
OPCODE(o6_invalid),
OPCODE(o6_getRandomNumber),
@ -826,19 +826,6 @@ void ScummEngine_v72he::o72_getNumFreeArrays() {
push (num);
}
void ScummEngine_v72he::o72_pickupObject() {
int obj, room;
room = pop();
obj = pop();
if (room == 0)
room = getObjectRoom(obj);
addObjectToInventory(obj, room);
putOwner(obj, VAR(VAR_EGO));
runInventoryScript(obj);
}
void ScummEngine_v72he::o72_actorOps() {
Actor *a;
int i, j, k;

2
scumm/script_v7he.cpp
View file

@ -554,10 +554,12 @@ void ScummEngine_v7he::o7_pickupObject() {
addObjectToInventory(obj, room);
putOwner(obj, VAR(VAR_EGO));
if (_heversion <= 70) {
putClass(obj, kObjectClassUntouchable, 1);
putState(obj, 1);
markObjectRectAsDirty(obj);
clearDrawObjectQueue();
}
runInventoryScript(obj); /* Difference */
}

2
scumm/script_v80he.cpp
View file

@ -210,7 +210,7 @@ void ScummEngine_v80he::setupOpcodes() {
OPCODE(o6_animateActor),
OPCODE(o6_doSentence),
/* 84 */
OPCODE(o72_pickupObject),
OPCODE(o7_pickupObject),
OPCODE(o6_loadRoomWithEgo),
OPCODE(o6_invalid),
OPCODE(o6_getRandomNumber),

2
scumm/script_v90he.cpp
View file

@ -210,7 +210,7 @@ void ScummEngine_v90he::setupOpcodes() {
OPCODE(o6_animateActor),
OPCODE(o6_doSentence),
/* 84 */
OPCODE(o72_pickupObject),
OPCODE(o7_pickupObject),
OPCODE(o6_loadRoomWithEgo),
OPCODE(o6_invalid),
OPCODE(o6_getRandomNumber),