[Scummvm-cvs-logs] SF.net SVN: scummvm: [21005] scummvm/trunk/engines/scumm
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Wed Mar 1 22:34:01 CET 2006
Revision: 21005
Author: kirben
Date: 2006-03-01 22:33:15 -0800 (Wed, 01 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=21005&view=rev
Log Message:
-----------
Typos
Modified Paths:
--------------
scummvm/trunk/engines/scumm/intern.h
scummvm/trunk/engines/scumm/script_c64.cpp
Modified: scummvm/trunk/engines/scumm/intern.h
===================================================================
--- scummvm/trunk/engines/scumm/intern.h 2006-03-02 06:06:24 UTC (rev 21004)
+++ scummvm/trunk/engines/scumm/intern.h 2006-03-02 06:33:15 UTC (rev 21005)
@@ -458,7 +458,7 @@
void o_setBitVar();
void o_doSentence();
void o_unknown2();
- void o_ifActiveOBject();
+ void o_ifActiveObject();
void o_getClosestObjActor();
void o_printEgo_c64();
void o_print_c64();
Modified: scummvm/trunk/engines/scumm/script_c64.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_c64.cpp 2006-03-02 06:06:24 UTC (rev 21004)
+++ scummvm/trunk/engines/scumm/script_c64.cpp 2006-03-02 06:33:15 UTC (rev 21005)
@@ -162,7 +162,7 @@
OPCODE(o2_stopScript),
OPCODE(o_stopCurrentScript),
/* 64 */
- OPCODE(o_ifActiveOBject),
+ OPCODE(o_ifActiveObject),
OPCODE(o_stopCurrentScript),
OPCODE(o_getClosestObjActor),
OPCODE(o5_getActorFacing),
@@ -322,7 +322,7 @@
OPCODE(o2_stopScript),
OPCODE(o_stopCurrentScript),
/* E4 */
- OPCODE(o_ifActiveOBject),
+ OPCODE(o_ifActiveObject),
OPCODE(o_loadRoomWithEgo),
OPCODE(o_stopCurrentScript),
OPCODE(o5_getActorFacing),
@@ -689,6 +689,7 @@
void ScummEngine_c64::o_nop() {
}
+// TODO: Maybe translate actor flags in future.
void ScummEngine_c64::o_setActorBitVar() {
byte act = getVarOrDirectByte(PARAM_1);
byte mask = getVarOrDirectByte(PARAM_2);
@@ -708,7 +709,7 @@
byte act = getVarOrDirectByte(PARAM_1);
byte mask = getVarOrDirectByte(PARAM_2);
- Actor *a = derefActor(act, "o_setActorBitVar");
+ Actor *a = derefActor(act, "o_getActorBitVar");
setResult((a->_miscflags & mask) ? 1 : 0);
debug(0, "o_getActorBitVar(%d, %d, %d)", act, mask, (a->_miscflags & mask));
@@ -759,7 +760,7 @@
warning("STUB: o_unknown2(%d)", var1);
}
-void ScummEngine_c64::o_ifActiveOBject() {
+void ScummEngine_c64::o_ifActiveObject() {
byte obj = fetchScriptByte();
if (obj == _activeObject)
More information about the Scummvm-git-logs
mailing list