From 943c3378153265c9404ea847b6d132240a699296 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Wed, 16 Apr 2008 10:20:58 +0000
Subject: Remove unused opcode and minor cleanup.

svn-id: r31513
---
 engines/agos/agos.h        |  1 -
 engines/agos/debug.h       |  4 ++--
 engines/agos/script_e1.cpp | 20 ++------------------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index baa67762b7..fc5dcba586 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -1272,7 +1272,6 @@ public:
 	void oe1_getUserItem();
 	void oe1_whereTo();
 	void oe1_doorExit();
-	void oe1_saveGame();
 	void oe1_loadGame();
 	void oe1_clearUserItem();
 	void oe1_findMaster();
diff --git a/engines/agos/debug.h b/engines/agos/debug.h
index 788c3206cc..58718968a4 100644
--- a/engines/agos/debug.h
+++ b/engines/agos/debug.h
@@ -367,8 +367,8 @@ static const char *const elvira1_opcodeNameTable[300] = {
 	"Www|SET_ADJ_NOUN",
 	"WW|ZONE_DISK",
 	/* 268 */
-	"|SAVE_GAME",
-	"|LOAD_GAME",
+	"|SAVE_USER_GAME",
+	"|LOAD_USER_GAME",
 	"|PRINT_STATS",
 	"|STOP_TUNE",
 	/* 272 */
diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp
index ed6780e162..f95ee3b47a 100644
--- a/engines/agos/script_e1.cpp
+++ b/engines/agos/script_e1.cpp
@@ -286,7 +286,7 @@ void AGOSEngine_Elvira1::setupOpcodes() {
 		OPCODE(o_invalid),
 		/* 200 */
 		OPCODE(o_invalid),
-		OPCODE(oe1_saveGame),
+		OPCODE(o_invalid),
 		OPCODE(oe1_loadGame),
 		OPCODE(o_invalid),
 		/* 204 */
@@ -692,26 +692,10 @@ void AGOSEngine_Elvira1::oe1_doorExit() {
 	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() {
-- 
cgit v1.2.3