Remove unused script code

svn-id: r24499

6 files changed, 14 insertions, 46 deletions

diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index fbc50667ca..e7ef5d3964 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -1063,7 +1063,6 @@ public:
 	void o_setAdjNoun();
 	void o_saveUserGame();
 	void o_loadUserGame();
-	void o_stopTune();
 	void o_pauseGame();
 	void o_copysf();
 	void o_restoreIcons();
@@ -1126,7 +1125,6 @@ public:
 	void oe1_pName();
 	void oe1_pcName();
 	void oe1_cFlag();
-	void oe1_means();
 	void oe1_setUserItem();
 	void oe1_getUserItem();
 	void oe1_whereTo();
@@ -1145,6 +1143,7 @@ public:
 	void oe1_bitTest();
 	void oe1_zoneDisk();
 	void oe1_printStats();
+	void oe1_stopTune();
 	void oe1_printPlayerDamage();
 	void oe1_printMonsterDamage();
 	void oe1_printPlayerHit();
@@ -1154,7 +1153,6 @@ public:
 	void oe2_moveDirn();
 	void oe2_doClass();
 	void oe2_pObj();
-	void oe2_loadUserGame();
 	void oe2_drawItem();
 	void oe2_setDoorOpen();
 	void oe2_setDoorClosed();
diff --git a/engines/agos/debug.h b/engines/agos/debug.h
index d3bee18c68..2923c33675 100644
--- a/engines/agos/debug.h
+++ b/engines/agos/debug.h
@@ -710,9 +710,9 @@ static const char *const waxworks_opcodeNameTable[256] = {
 	"W|START_SUB",
 	/* 72 */
 	NULL,
-	"I|PRINT_OBJ",
-	"I|PRINT_NAME",
-	"I|PRINT_CNAME",
+	NULL,
+	NULL,
+	NULL,
 	/* 76 */
 	"WW|ADD_TIMEOUT",
 	"J|IS_M1_EMPTY",
@@ -760,7 +760,7 @@ static const char *const waxworks_opcodeNameTable[256] = {
 	"WWW|MOVE_BOX",
 	/* 112 */
 	NULL,
-	"IBWW|DRAW_ITEM",
+	NULL,
 	"IB|DO_ICONS",
 	"IBJ|IS_CLASS",
 	/* 116 */
@@ -772,9 +772,9 @@ static const char *const waxworks_opcodeNameTable[256] = {
 	"W|SYNC",
 	"BI|DEF_OBJ",
 	NULL,
-	"|SET_TIME",
+	NULL,
 	/* 124 */
-	"WJ|IF_TIME",
+	NULL,
 	"IJ|IS_SIBLING_WITH_A",
 	"IBB|DO_CLASS_ICONS",
 	"WW|PLAY_TUNE",
diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp
index 7971739cac..3ebe92518e 100644
--- a/engines/agos/script.cpp
+++ b/engines/agos/script.cpp
@@ -124,7 +124,6 @@ void AGOSEngine::setupCommonOpcodes(OpcodeProc *op) {
 	op[130] = &AGOSEngine::o_setAdjNoun;
 	op[132] = &AGOSEngine::o_saveUserGame;
 	op[133] = &AGOSEngine::o_loadUserGame;
-	op[134] = &AGOSEngine::o_stopTune;
 	op[135] = &AGOSEngine::o_pauseGame;
 	op[136] = &AGOSEngine::o_copysf;
 	op[137] = &AGOSEngine::o_restoreIcons;
@@ -882,14 +881,6 @@ void AGOSEngine::o_loadUserGame() {
 	_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
 }
 
-void AGOSEngine::o_stopTune() {
-	// 134: stop tune
-	if (getGameType() == GType_SIMON2) {
-		midi.stop();
-		_lastMusicPlayed = -1;
-	}
-}
-
 void AGOSEngine::o_pauseGame() {
 	// 135: quit if user presses y
 	_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp
index ad4aabf9f8..a58125b85f 100644
--- a/engines/agos/script_e1.cpp
+++ b/engines/agos/script_e1.cpp
@@ -131,7 +131,6 @@ void AGOSEngine::setupElvira1Opcodes(OpcodeProc *op) {
 	op[162] = &AGOSEngine::oe1_cFlag;
 
 	op[164] = &AGOSEngine::o1_rescan;
-	op[165] = &AGOSEngine::oe1_means;
 
 	op[176] = &AGOSEngine::oe1_setUserItem;
 	op[177] = &AGOSEngine::oe1_getUserItem;
@@ -194,7 +193,7 @@ void AGOSEngine::setupElvira1Opcodes(OpcodeProc *op) {
 	op[268] = &AGOSEngine::o_saveUserGame;
 	op[269] = &AGOSEngine::o_loadUserGame;
 	op[270] = &AGOSEngine::oe1_printStats;
-	op[271] = &AGOSEngine::o_stopTune;
+	op[271] = &AGOSEngine::oe1_stopTune;
 	op[272] = &AGOSEngine::oe1_printPlayerDamage;
 	op[273] = &AGOSEngine::oe1_printMonsterDamage;
 	op[274] = &AGOSEngine::o_pauseGame;
@@ -407,19 +406,6 @@ void AGOSEngine::oe1_cFlag() {
 		setScriptCondition((c->flags & (1 << bit)) != 0);
 }
 
-void AGOSEngine::oe1_means() {
-	// 165: means
-	_scriptVerb = getNextWord();
-	_scriptNoun1 = getNextWord();
-	_scriptNoun2 = getNextWord();
-
-	if (getVarOrWord()) {
-		int16 tmp = _scriptNoun1;
-		_scriptNoun1 = _scriptNoun2;
-		_scriptNoun2 = tmp;
-	}
-}
-
 void AGOSEngine::oe1_setUserItem() {
 	// 176: set user item
 	Item *i = getNextItemPtr();
@@ -657,6 +643,10 @@ void AGOSEngine::oe1_printStats() {
 	mouseOn();
 }
 
+void AGOSEngine::oe1_stopTune() {
+	// 271: stop tune
+}
+
 void AGOSEngine::oe1_printPlayerDamage() {
 	// 272: print player damage
 	WindowBlock *window = _dummyWindow;
diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp
index 3594255d5b..5c88e335a5 100644
--- a/engines/agos/script_e2.cpp
+++ b/engines/agos/script_e2.cpp
@@ -47,7 +47,7 @@ void AGOSEngine::setupElvira2Opcodes(OpcodeProc *op) {
 	op[74] = &AGOSEngine::oe1_pName;
 	op[75] = &AGOSEngine::oe1_pcName;
 	op[83] = &AGOSEngine::o1_rescan;
-	op[89] = &AGOSEngine::oe2_loadUserGame;
+	op[89] = &AGOSEngine::oe1_loadGame;
 	op[94] = &AGOSEngine::oe1_findMaster;
 	op[95] = &AGOSEngine::oe1_nextMaster;
 	op[98] = &AGOSEngine::o1_animate;
@@ -125,11 +125,6 @@ void AGOSEngine::oe2_pObj() {
 		showMessageFormat((const char *)getStringPtrByID(subObject->objectFlagValue[0]));
 }
 
-void AGOSEngine::oe2_loadUserGame() {
-	// 89: load user game
-	getStringPtrByID(getNextStringID());
-}
-
 void AGOSEngine::oe2_drawItem() {
 	// 113: draw item
 	Item *i = getNextItemPtr();
diff --git a/engines/agos/script_ww.cpp b/engines/agos/script_ww.cpp
index 09563df092..b544383841 100644
--- a/engines/agos/script_ww.cpp
+++ b/engines/agos/script_ww.cpp
@@ -49,21 +49,15 @@ void AGOSEngine::setupWaxworksOpcodes(OpcodeProc *op) {
 	op[66] = &AGOSEngine::o_setShortText;
 	op[67] = &AGOSEngine::o_setLongText;
 	op[70] = &AGOSEngine::o1_printLongText;
-	op[73] = &AGOSEngine::oe2_pObj;
-	op[74] = &AGOSEngine::oe1_pName;
-	op[75] = &AGOSEngine::oe1_pcName;
 	op[83] = &AGOSEngine::o1_rescan;
 	op[85] = &AGOSEngine::oww_whereTo;
-	op[89] = &AGOSEngine::oe2_loadUserGame;
+	op[89] = &AGOSEngine::oe1_loadGame;
 	op[94] = &AGOSEngine::oe1_findMaster;
 	op[95] = &AGOSEngine::oe1_nextMaster;
 	op[98] = &AGOSEngine::o1_animate;
 	op[99] = &AGOSEngine::o1_stopAnimate;
 	op[105] = &AGOSEngine::oww_menu;
 	op[106] = &AGOSEngine::oww_textMenu;
-	op[113] = &AGOSEngine::oe2_drawItem;
-	op[123] = &AGOSEngine::oe1_setTime;
-	op[124] = &AGOSEngine::oe1_ifTime;
 	op[127] = &AGOSEngine::o1_playTune;
 	op[144] = &AGOSEngine::oe2_setDoorOpen;
 	op[145] = &AGOSEngine::oe2_setDoorClosed;