[Scummvm-cvs-logs] SF.net SVN: scummvm: [27770] scummvm/trunk/engines/agos
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Fri Jun 29 04:06:47 CEST 2007
Revision: 27770
http://scummvm.svn.sourceforge.net/scummvm/?rev=27770&view=rev
Author: Kirben
Date: 2007-06-28 19:06:46 -0700 (Thu, 28 Jun 2007)
Log Message:
-----------
Fix some scripts failing to start in Elvira 2, due code difference in isCalled opcode.
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/script_e2.cpp
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2007-06-29 00:56:29 UTC (rev 27769)
+++ scummvm/trunk/engines/agos/agos.h 2007-06-29 02:06:46 UTC (rev 27770)
@@ -1316,6 +1316,7 @@
void oe2_moveDirn();
void oe2_doClass();
void oe2_pObj();
+ void oe2_isCalled();
void oe2_loadGame();
void oe2_drawItem();
void oe2_doTable();
Modified: scummvm/trunk/engines/agos/script_e2.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_e2.cpp 2007-06-29 00:56:29 UTC (rev 27769)
+++ scummvm/trunk/engines/agos/script_e2.cpp 2007-06-29 02:06:46 UTC (rev 27770)
@@ -132,7 +132,7 @@
OPCODE(o_when),
OPCODE(o_if1),
OPCODE(o_if2),
- OPCODE(oe1_isCalled),
+ OPCODE(oe2_isCalled),
/* 80 */
OPCODE(o_is),
OPCODE(o_invalid),
@@ -315,6 +315,13 @@
showMessageFormat("%s\n", (const char *)getStringPtrByID(subObject->objectFlagValue[0])); // Difference
}
+void AGOSEngine_Elvira2::oe2_isCalled() {
+ // 79: childstruct fr2 is
+ Item *i = getNextItemPtr();
+ uint stringId = getNextStringID();
+ setScriptCondition(i->itemName == stringId);
+}
+
void AGOSEngine_Elvira2::oe2_loadGame() {
// 89: load game
uint16 stringId = getNextStringID();
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