[Scummvm-cvs-logs] SF.net SVN: scummvm: [21251] scummvm/trunk/engines/scumm
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Sun Mar 12 23:48:01 CET 2006
Revision: 21251
Author: kirben
Date: 2006-03-12 23:46:54 -0800 (Sun, 12 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21251&view=rev
Log Message:
-----------
Add opcode difference in setObjectName opcode for C64 maniac
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-13 06:06:51 UTC (rev 21250)
+++ scummvm/trunk/engines/scumm/intern.h 2006-03-13 07:46:54 UTC (rev 21251)
@@ -442,6 +442,7 @@
void o_animateActor();
void o_putActorAtObject();
void o_pickupObject();
+ void o_setObjectName();
void o_lockSound();
void o_lockCostume();
void o_loadCostume();
@@ -455,7 +456,6 @@
void o_unlockCostume();
void o_unlockScript();
void o_decrement();
- void o_badOpcode();
void o_nop();
void o_getActorBitVar();
void o_setActorBitVar();
Modified: scummvm/trunk/engines/scumm/script_c64.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_c64.cpp 2006-03-13 06:06:51 UTC (rev 21250)
+++ scummvm/trunk/engines/scumm/script_c64.cpp 2006-03-13 07:46:54 UTC (rev 21251)
@@ -141,7 +141,7 @@
OPCODE(o5_actorFollowCamera),
OPCODE(o_lockSound),
/* 54 */
- OPCODE(o5_setObjectName),
+ OPCODE(o_setObjectName),
OPCODE(o5_walkActorToActor),
OPCODE(o_getActorMoving),
OPCODE(o_clearState08),
@@ -203,7 +203,7 @@
/* 84 */
OPCODE(o_isGreaterEqual),
OPCODE(o_stopCurrentScript),
- OPCODE(o_badOpcode),
+ OPCODE(o_nop),
OPCODE(o5_getActorRoom),
/* 88 */
OPCODE(o_isNotEqual),
@@ -301,7 +301,7 @@
OPCODE(o5_actorFollowCamera),
OPCODE(o_unlockSound),
/* D4 */
- OPCODE(o5_setObjectName),
+ OPCODE(o_setObjectName),
OPCODE(o2_actorFromPos),
OPCODE(o_getActorMoving),
OPCODE(o_setState08),
@@ -770,8 +770,9 @@
runInventoryScript(1);
}
-void ScummEngine_c64::o_badOpcode() {
- warning("Bad opcode 0x86 encountered");
+void ScummEngine_c64::o_setObjectName() {
+ int obj = fetchScriptByte();
+ setObjectName(obj);
}
void ScummEngine_c64::o_nop() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list