[Scummvm-cvs-logs] SF.net SVN: scummvm: [27843] scummvm/branches/branch-0-10-0/engines/agos

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Mon Jul 2 01:58:10 CEST 2007


Revision: 27843
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27843&view=rev
Author:   Kirben
Date:     2007-07-01 16:58:09 -0700 (Sun, 01 Jul 2007)

Log Message:
-----------
Fix bug #1746107 - Elvira 2: Crash Catacombs lev2.

Modified Paths:
--------------
    scummvm/branches/branch-0-10-0/engines/agos/agos.h
    scummvm/branches/branch-0-10-0/engines/agos/script_e2.cpp
    scummvm/branches/branch-0-10-0/engines/agos/script_ww.cpp

Modified: scummvm/branches/branch-0-10-0/engines/agos/agos.h
===================================================================
--- scummvm/branches/branch-0-10-0/engines/agos/agos.h	2007-07-01 23:57:49 UTC (rev 27842)
+++ scummvm/branches/branch-0-10-0/engines/agos/agos.h	2007-07-01 23:58:09 UTC (rev 27843)
@@ -1318,6 +1318,7 @@
 	void oe2_pObj();
 	void oe2_isCalled();
 	void oe2_loadGame();
+	void oe2_menu();
 	void oe2_drawItem();
 	void oe2_doTable();
 	void oe2_pauseGame();
@@ -1409,7 +1410,6 @@
 	void oww_setLongText();
 	void oww_printLongText();
 	void oww_whereTo();
-	void oww_menu();
 	void oww_textMenu();
 	void oww_pauseGame();
 	void oww_boxMessage();

Modified: scummvm/branches/branch-0-10-0/engines/agos/script_e2.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/agos/script_e2.cpp	2007-07-01 23:57:49 UTC (rev 27842)
+++ scummvm/branches/branch-0-10-0/engines/agos/script_e2.cpp	2007-07-01 23:58:09 UTC (rev 27843)
@@ -165,8 +165,8 @@
 		OPCODE(o_cls),
 		/* 104 */
 		OPCODE(o_closeWindow),
+		OPCODE(oe2_menu),
 		OPCODE(o_invalid),
-		OPCODE(o_invalid),
 		OPCODE(o_addBox),
 		/* 108 */
 		OPCODE(o_delBox),
@@ -333,6 +333,11 @@
 	}
 }
 
+void AGOSEngine_Elvira2::oe2_menu() {
+	// 105: set agos menu
+	_agosMenu = getVarOrByte();
+}
+
 void AGOSEngine_Elvira2::oe2_drawItem() {
 	// 113: draw item
 	Item *i = getNextItemPtr();

Modified: scummvm/branches/branch-0-10-0/engines/agos/script_ww.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/agos/script_ww.cpp	2007-07-01 23:57:49 UTC (rev 27842)
+++ scummvm/branches/branch-0-10-0/engines/agos/script_ww.cpp	2007-07-01 23:58:09 UTC (rev 27843)
@@ -167,7 +167,7 @@
 		OPCODE(o_cls),
 		/* 104 */
 		OPCODE(o_closeWindow),
-		OPCODE(oww_menu),
+		OPCODE(oe2_menu),
 		OPCODE(oww_textMenu),
 		OPCODE(o_addBox),
 		/* 108 */
@@ -355,11 +355,6 @@
 		_objectItem = derefItem(getExitOf(i, d));
 }
 
-void AGOSEngine_Waxworks::oww_menu() {
-	// 105: set agos menu
-	_agosMenu = getVarOrByte();
-}
-
 void AGOSEngine_Waxworks::oww_textMenu() {
 	// 106: set text menu
 	byte slot = getVarOrByte();


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