[Scummvm-cvs-logs] SF.net SVN: scummvm: [24432] scummvm/trunk/engines/agos

kirben at users.sourceforge.net kirben at users.sourceforge.net
Sun Oct 22 12:15:06 CEST 2006


Revision: 24432
          http://svn.sourceforge.net/scummvm/?rev=24432&view=rev
Author:   kirben
Date:     2006-10-22 03:14:58 -0700 (Sun, 22 Oct 2006)

Log Message:
-----------
Add print object opcode difference in Elivra 2 and WW

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/script_e2.cpp
    scummvm/trunk/engines/agos/script_ww.cpp

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2006-10-22 09:53:56 UTC (rev 24431)
+++ scummvm/trunk/engines/agos/agos.h	2006-10-22 10:14:58 UTC (rev 24432)
@@ -1129,6 +1129,7 @@
 
 	// Opcodes, Elvira 2 only
 	void oe2_moveDirn();
+	void oe2_pObj();
 	void oe2_loadUserGame();
 	void oe2_setDoorOpen();
 	void oe2_setDoorClosed();

Modified: scummvm/trunk/engines/agos/script_e2.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_e2.cpp	2006-10-22 09:53:56 UTC (rev 24431)
+++ scummvm/trunk/engines/agos/script_e2.cpp	2006-10-22 10:14:58 UTC (rev 24432)
@@ -42,7 +42,7 @@
 	op[37] = &AGOSEngine::oe1_whatO;
 	op[39] = &AGOSEngine::oe1_weigh;
 	op[54] = &AGOSEngine::oe2_moveDirn;
-	op[73] = &AGOSEngine::oe1_pObj;
+	op[73] = &AGOSEngine::oe2_pObj;
 	op[74] = &AGOSEngine::oe1_pName;
 	op[75] = &AGOSEngine::oe1_pcName;
 	op[83] = &AGOSEngine::o1_rescan;
@@ -82,6 +82,14 @@
 	moveDirn_e2(me(), d);
 }
 
+void AGOSEngine::oe2_pObj() {
+	// 73: print object
+	SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), 2);
+
+	if (subObject != NULL && subObject->objectFlags & kOFText)
+		showMessageFormat((const char *)getStringPtrByID(subObject->objectFlagValue[0]));
+}
+
 void AGOSEngine::oe2_loadUserGame() {
 	// 89: load user game
 	getStringPtrByID(getNextStringID());

Modified: scummvm/trunk/engines/agos/script_ww.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_ww.cpp	2006-10-22 09:53:56 UTC (rev 24431)
+++ scummvm/trunk/engines/agos/script_ww.cpp	2006-10-22 10:14:58 UTC (rev 24432)
@@ -49,7 +49,7 @@
 	op[66] = &AGOSEngine::o_setShortText;
 	op[67] = &AGOSEngine::o_setLongText;
 	op[70] = &AGOSEngine::o1_printLongText;
-	op[73] = &AGOSEngine::oe1_pObj;
+	op[73] = &AGOSEngine::oe2_pObj;
 	op[74] = &AGOSEngine::oe1_pName;
 	op[75] = &AGOSEngine::oe1_pcName;
 	op[83] = &AGOSEngine::o1_rescan;
@@ -150,7 +150,7 @@
 }
 
 void AGOSEngine::oww_boxPObj() {
-	// 188: print object flag name to box
+	// 188: print object name to box
 	SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), 2);
 
 	if (subObject != NULL && subObject->objectFlags & kOFText)


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