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

renamed o5_actorSetClass to o5_setClass

Browse source 
svn-id: r4553
This commit is contained in:
Max Horn 2002-07-15 15:56:56 +00:00
parent f0f63107a2
commit 191c808a48
2 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
script_v1.cpp
View file

@ -144,7 +144,7 @@ void Scumm::setupOpcodes()
&Scumm::o5_divide, &Scumm::o5_divide,
/* 5C */ /* 5C */
&Scumm::o5_oldRoomEffect, &Scumm::o5_oldRoomEffect,
&Scumm::o5_actorSetClass, &Scumm::o5_setClass,
&Scumm::o5_walkActorTo, &Scumm::o5_walkActorTo,
&Scumm::o5_isActorInBox, &Scumm::o5_isActorInBox,
/* 60 */ /* 60 */
@ -304,7 +304,7 @@ void Scumm::setupOpcodes()
&Scumm::o5_divide, &Scumm::o5_divide,
/* DC */ /* DC */
&Scumm::o5_oldRoomEffect, &Scumm::o5_oldRoomEffect,
&Scumm::o5_actorSetClass, &Scumm::o5_setClass,
&Scumm::o5_walkActorTo, &Scumm::o5_walkActorTo,
&Scumm::o5_isActorInBox, &Scumm::o5_isActorInBox,
/* E0 */ /* E0 */
@ -467,7 +467,7 @@ void Scumm::setupOpcodes()
"o5_divide", "o5_divide",
/* 5C */ /* 5C */
"o5_oldRoomEffect", "o5_oldRoomEffect",
"o5_actorSetClass", "o5_setClass",
"o5_walkActorTo", "o5_walkActorTo",
"o5_isActorInBox", "o5_isActorInBox",
/* 60 */ /* 60 */
@ -627,7 +627,7 @@ void Scumm::setupOpcodes()
"o5_divide", "o5_divide",
/* DC */ /* DC */
"o5_oldRoomEffect", "o5_oldRoomEffect",
"o5_actorSetClass", "o5_setClass",
"o5_walkActorTo", "o5_walkActorTo",
"o5_isActorInBox", "o5_isActorInBox",
/* E0 */ /* E0 */
@ -833,33 +833,27 @@ void Scumm::o5_actorSet()
} }
} }
void Scumm::o5_actorSetClass() void Scumm::o5_setClass()
{ {
int act = getVarOrDirectWord(0x80); int obj = getVarOrDirectWord(0x80);
int newClass; int newClass;
while ((_opcode = fetchScriptByte()) != 0xFF) { while ((_opcode = fetchScriptByte()) != 0xFF) {
newClass = getVarOrDirectWord(0x80); newClass = getVarOrDirectWord(0x80);
if (newClass == 0) { if (newClass == 0) {
_classData[act] = 0; _classData[obj] = 0;
if ((_features & GF_SMALL_HEADER) && act <= NUM_ACTORS) { if ((_features & GF_SMALL_HEADER) && obj <= NUM_ACTORS) {
Actor *a; Actor *a;
a = derefActorSafe(act, "actorSetClass"); a = derefActorSafe(obj, "setClass");
a->forceClip = 0; a->forceClip = 0;
} }
continue; continue;
} }
if (_gameId == GID_INDY3_256) if (_gameId == GID_INDY3_256)
newClass--; newClass--;
putClass(obj, newClass, (newClass & 0x80));
if (newClass & 0x80)
putClass(act, newClass, 1);
else
putClass(act, newClass, 0);
} }
} }

2
scumm.h
View file

@ -1267,7 +1267,6 @@ public:
void o5_actorFollowCamera(); void o5_actorFollowCamera();
void o5_actorFromPos(); void o5_actorFromPos();
void o5_actorSet(); void o5_actorSet();
void o5_actorSetClass();
void o5_add(); void o5_add();
void o5_and(); void o5_and();
void o5_animateActor(); void o5_animateActor();
@ -1344,6 +1343,7 @@ public:
void o5_roomOps(); void o5_roomOps();
void o5_saveRestoreVerbs(); void o5_saveRestoreVerbs();
void o5_setCameraAt(); void o5_setCameraAt();
void o5_setClass();
void o5_setObjectName(); void o5_setObjectName();
void o5_setOwnerOf(); void o5_setOwnerOf();
void o5_setState(); void o5_setState();