[Scummvm-cvs-logs] CVS: scummvm scumm.h,1.180,1.181 script_v1.cpp,1.122,1.123
Max Horn
fingolfin at users.sourceforge.net
Mon Jul 15 08:57:07 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv2029
Modified Files:
scumm.h script_v1.cpp
Log Message:
renamed o5_actorSetClass to o5_setClass
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- scumm.h 13 Jul 2002 14:07:36 -0000 1.180
+++ scumm.h 15 Jul 2002 15:56:56 -0000 1.181
@@ -1267,7 +1267,6 @@
void o5_actorFollowCamera();
void o5_actorFromPos();
void o5_actorSet();
- void o5_actorSetClass();
void o5_add();
void o5_and();
void o5_animateActor();
@@ -1344,6 +1343,7 @@
void o5_roomOps();
void o5_saveRestoreVerbs();
void o5_setCameraAt();
+ void o5_setClass();
void o5_setObjectName();
void o5_setOwnerOf();
void o5_setState();
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- script_v1.cpp 15 Jul 2002 01:38:51 -0000 1.122
+++ script_v1.cpp 15 Jul 2002 15:56:56 -0000 1.123
@@ -144,7 +144,7 @@
&Scumm::o5_divide,
/* 5C */
&Scumm::o5_oldRoomEffect,
- &Scumm::o5_actorSetClass,
+ &Scumm::o5_setClass,
&Scumm::o5_walkActorTo,
&Scumm::o5_isActorInBox,
/* 60 */
@@ -304,7 +304,7 @@
&Scumm::o5_divide,
/* DC */
&Scumm::o5_oldRoomEffect,
- &Scumm::o5_actorSetClass,
+ &Scumm::o5_setClass,
&Scumm::o5_walkActorTo,
&Scumm::o5_isActorInBox,
/* E0 */
@@ -467,7 +467,7 @@
"o5_divide",
/* 5C */
"o5_oldRoomEffect",
- "o5_actorSetClass",
+ "o5_setClass",
"o5_walkActorTo",
"o5_isActorInBox",
/* 60 */
@@ -627,7 +627,7 @@
"o5_divide",
/* DC */
"o5_oldRoomEffect",
- "o5_actorSetClass",
+ "o5_setClass",
"o5_walkActorTo",
"o5_isActorInBox",
/* E0 */
@@ -833,33 +833,27 @@
}
}
-void Scumm::o5_actorSetClass()
+void Scumm::o5_setClass()
{
- int act = getVarOrDirectWord(0x80);
+ int obj = getVarOrDirectWord(0x80);
int newClass;
while ((_opcode = fetchScriptByte()) != 0xFF) {
newClass = getVarOrDirectWord(0x80);
if (newClass == 0) {
- _classData[act] = 0;
- if ((_features & GF_SMALL_HEADER) && act <= NUM_ACTORS) {
+ _classData[obj] = 0;
+ if ((_features & GF_SMALL_HEADER) && obj <= NUM_ACTORS) {
Actor *a;
- a = derefActorSafe(act, "actorSetClass");
+ a = derefActorSafe(obj, "setClass");
a->forceClip = 0;
}
continue;
}
-
if (_gameId == GID_INDY3_256)
-
newClass--;
-
- if (newClass & 0x80)
- putClass(act, newClass, 1);
- else
- putClass(act, newClass, 0);
+ putClass(obj, newClass, (newClass & 0x80));
}
}
More information about the Scummvm-git-logs
mailing list