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

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Wed Apr 16 14:24:09 CEST 2008


Revision: 31514
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31514&view=rev
Author:   Kirben
Date:     2008-04-16 05:24:09 -0700 (Wed, 16 Apr 2008)

Log Message:
-----------
Minor cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/debug.h
    scummvm/trunk/engines/agos/script_e1.cpp
    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	2008-04-16 10:20:58 UTC (rev 31513)
+++ scummvm/trunk/engines/agos/agos.h	2008-04-16 12:24:09 UTC (rev 31514)
@@ -1320,7 +1320,6 @@
 	void oe2_doClass();
 	void oe2_pObj();
 	void oe2_isCalled();
-	void oe2_loadGame();
 	void oe2_menu();
 	void oe2_drawItem();
 	void oe2_doTable();

Modified: scummvm/trunk/engines/agos/debug.h
===================================================================
--- scummvm/trunk/engines/agos/debug.h	2008-04-16 10:20:58 UTC (rev 31513)
+++ scummvm/trunk/engines/agos/debug.h	2008-04-16 12:24:09 UTC (rev 31514)
@@ -501,7 +501,7 @@
 	"W|COMMENT",
 	/* 88 */
 	"|STOP_ANIMATION",
-	"T|LOAD_USER_GAME",
+	"T|LOAD_GAME",
 	"IB|GET_PARENT",
 	"IB|GET_NEXT",
 	/* 92 */
@@ -734,7 +734,7 @@
 	"W|COMMENT",
 	/* 88 */
 	"|STOP_ANIMATION",
-	"T|LOAD_USER_GAME",
+	"T|LOAD_GAME",
 	"IB|GET_PARENT",
 	"IB|GET_NEXT",
 	/* 92 */

Modified: scummvm/trunk/engines/agos/script_e1.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_e1.cpp	2008-04-16 10:20:58 UTC (rev 31513)
+++ scummvm/trunk/engines/agos/script_e1.cpp	2008-04-16 12:24:09 UTC (rev 31514)
@@ -693,7 +693,7 @@
 }
 
 void AGOSEngine_Elvira1::oe1_loadGame() {
-	// 202: load game
+	// 202: load restart state
 	uint16 stringId = getNextStringID();
 	loadGame((const char *)getStringPtrByID(stringId), true);
 }

Modified: scummvm/trunk/engines/agos/script_e2.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_e2.cpp	2008-04-16 10:20:58 UTC (rev 31513)
+++ scummvm/trunk/engines/agos/script_e2.cpp	2008-04-16 12:24:09 UTC (rev 31514)
@@ -145,7 +145,7 @@
 		OPCODE(o_comment),
 		/* 88 */
 		OPCODE(o_invalid),
-		OPCODE(oe2_loadGame),
+		OPCODE(oe1_loadGame),
 		OPCODE(o_getParent),
 		OPCODE(o_getNext),
 		/* 92 */
@@ -322,17 +322,6 @@
 	setScriptCondition(i->itemName == stringId);
 }
 
-void AGOSEngine_Elvira2::oe2_loadGame() {
-	// 89: load game
-	uint16 stringId = getNextStringID();
-
-	if (!scumm_stricmp(getFileName(GAME_RESTFILE), (const char *)getStringPtrByID(stringId))) {
-		loadGame(getFileName(GAME_RESTFILE), true);
-	} else {
-		loadGame((const char *)getStringPtrByID(stringId));
-	}
-}
-
 void AGOSEngine_Elvira2::oe2_menu() {
 	// 105: set agos menu
 	_agosMenu = getVarOrByte();

Modified: scummvm/trunk/engines/agos/script_ww.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_ww.cpp	2008-04-16 10:20:58 UTC (rev 31513)
+++ scummvm/trunk/engines/agos/script_ww.cpp	2008-04-16 12:24:09 UTC (rev 31514)
@@ -147,7 +147,7 @@
 		OPCODE(o_comment),
 		/* 88 */
 		OPCODE(o_invalid),
-		OPCODE(oe2_loadGame),
+		OPCODE(oe1_loadGame),
 		OPCODE(o_getParent),
 		OPCODE(o_getNext),
 		/* 92 */


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