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

[Kirben at users.sourceforge.net]

Revision: 31513
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31513&view=rev
Author:   Kirben
Date:     2008-04-16 03:20:58 -0700 (Wed, 16 Apr 2008)

Log Message:
-----------
Remove unused opcode and minor cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/debug.h
    scummvm/trunk/engines/agos/script_e1.cpp

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2008-04-16 08:50:25 UTC (rev 31512)
+++ scummvm/trunk/engines/agos/agos.h	2008-04-16 10:20:58 UTC (rev 31513)
@@ -1272,7 +1272,6 @@
 	void oe1_getUserItem();
 	void oe1_whereTo();
 	void oe1_doorExit();
-	void oe1_saveGame();
 	void oe1_loadGame();
 	void oe1_clearUserItem();
 	void oe1_findMaster();

Modified: scummvm/trunk/engines/agos/debug.h
===================================================================
--- scummvm/trunk/engines/agos/debug.h	2008-04-16 08:50:25 UTC (rev 31512)
+++ scummvm/trunk/engines/agos/debug.h	2008-04-16 10:20:58 UTC (rev 31513)
@@ -367,8 +367,8 @@
 	"Www|SET_ADJ_NOUN",
 	"WW|ZONE_DISK",
 	/* 268 */
-	"|SAVE_GAME",
-	"|LOAD_GAME",
+	"|SAVE_USER_GAME",
+	"|LOAD_USER_GAME",
 	"|PRINT_STATS",
 	"|STOP_TUNE",
 	/* 272 */

Modified: scummvm/trunk/engines/agos/script_e1.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_e1.cpp	2008-04-16 08:50:25 UTC (rev 31512)
+++ scummvm/trunk/engines/agos/script_e1.cpp	2008-04-16 10:20:58 UTC (rev 31513)
@@ -286,7 +286,7 @@
 		OPCODE(o_invalid),
 		/* 200 */
 		OPCODE(o_invalid),
-		OPCODE(oe1_saveGame),
+		OPCODE(o_invalid),
 		OPCODE(oe1_loadGame),
 		OPCODE(o_invalid),
 		/* 204 */
@@ -692,26 +692,10 @@
 	writeVariable(f, 255);
 }
 
-void AGOSEngine_Elvira1::oe1_saveGame() {
-	// 201: save game
-	uint16 stringId = getNextStringID();
-
-	debug(0, "oe1_saveGame: stub (%s)", getStringPtrByID(stringId));
-
-	// TODO: Add support for selecting slot
-	saveGame(1, (const char *)getStringPtrByID(stringId));
-}
-
 void AGOSEngine_Elvira1::oe1_loadGame() {
 	// 202: load game
 	uint16 stringId = getNextStringID();
-	debug(0, "oe1_loadGame: stub (%s)", (const char *)getStringPtrByID(stringId));
-
-	if (!scumm_stricmp("START", (const char *)getStringPtrByID(stringId))) {
-		loadGame("START", true);
-	} else {
-		loadGame((const char *)getStringPtrByID(stringId));
-	}
+	loadGame((const char *)getStringPtrByID(stringId), true);
 }
 
 void AGOSEngine_Elvira1::oe1_clearUserItem() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.