[Scummvm-cvs-logs] SF.net SVN: scummvm: [24495] scummvm/trunk/engines/agos
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Wed Oct 25 12:20:24 CEST 2006
Revision: 24495
http://svn.sourceforge.net/scummvm/?rev=24495&view=rev
Author: kirben
Date: 2006-10-25 03:20:17 -0700 (Wed, 25 Oct 2006)
Log Message:
-----------
Remove unused script opcodes
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/debug.h
scummvm/trunk/engines/agos/script.cpp
scummvm/trunk/engines/agos/script_e1.cpp
scummvm/trunk/engines/agos/subroutine.cpp
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2006-10-25 10:08:38 UTC (rev 24494)
+++ scummvm/trunk/engines/agos/agos.h 2006-10-25 10:20:17 UTC (rev 24495)
@@ -1060,8 +1060,6 @@
void o_defObj();
void o_here();
void o_doClassIcons();
- void o_waitEndTune();
- void o_ifEndTune();
void o_setAdjNoun();
void o_saveUserGame();
void o_loadUserGame();
Modified: scummvm/trunk/engines/agos/debug.h
===================================================================
--- scummvm/trunk/engines/agos/debug.h 2006-10-25 10:08:38 UTC (rev 24494)
+++ scummvm/trunk/engines/agos/debug.h 2006-10-25 10:20:17 UTC (rev 24495)
@@ -358,8 +358,8 @@
"IWW|DO_CLASS_ICONS",
"WW|PLAY_TUNE",
/* 264 */
- "W|WAIT_END_TUNE",
- "W|IF_END_TUNE",
+ NULL,
+ NULL,
"Www|SET_ADJ_NOUN",
"WW|ZONE_DISK",
/* 268 */
@@ -546,8 +546,8 @@
"IBB|DO_CLASS_ICONS",
"WW|PLAY_TUNE",
/* 128 */
- "W|WAIT_END_TUNE",
- "W|IF_END_TUNE",
+ NULL,
+ NULL,
"Bww|SET_ADJ_NOUN",
NULL,
/* 132 */
@@ -779,8 +779,8 @@
"IBB|DO_CLASS_ICONS",
"WW|PLAY_TUNE",
/* 128 */
- "W|WAIT_END_TUNE",
- "W|IF_END_TUNE",
+ NULL,
+ NULL,
"Bww|SET_ADJ_NOUN",
NULL,
/* 132 */
@@ -1021,8 +1021,8 @@
"IBB|DO_CLASS_ICONS",
"WW|PLAY_TUNE",
/* 128 */
- "W|WAIT_END_TUNE",
- "W|IF_END_TUNE",
+ NULL,
+ NULL,
"Bww|SET_ADJ_NOUN",
NULL,
/* 132 */
@@ -1259,8 +1259,8 @@
"IBB|DO_CLASS_ICONS",
"WW|PLAY_TUNE",
/* 128 */
- "W|WAIT_END_TUNE",
- "W|IF_END_TUNE",
+ NULL,
+ NULL,
"Bww|SET_ADJ_NOUN",
NULL,
/* 132 */
@@ -1497,8 +1497,8 @@
"IBB|DO_CLASS_ICONS",
"WWB|PLAY_TUNE",
/* 128 */
- "W|WAIT_END_TUNE",
- "W|IF_END_TUNE",
+ NULL,
+ NULL,
"Bww|SET_ADJ_NOUN",
NULL,
/* 132 */
@@ -1739,8 +1739,8 @@
"IBB|DO_CLASS_ICONS",
"WWB|PLAY_TUNE",
/* 128 */
- "W|WAIT_END_TUNE",
- "W|IF_END_TUNE",
+ NULL,
+ NULL,
"Bww|SET_ADJ_NOUN",
NULL,
/* 132 */
@@ -1981,8 +1981,8 @@
"IBB|DO_CLASS_ICONS",
"WWB|PLAY_TUNE",
/* 128 */
- "W|WAIT_END_TUNE",
- "W|IF_END_TUNE",
+ NULL,
+ NULL,
"Bww|SET_ADJ_NOUN",
"|SET_TIME",
/* 132 */
@@ -2234,8 +2234,8 @@
"IBB|DO_CLASS_ICONS",
"WWB|PLAY_TUNE",
/* 128 */
- "W|WAIT_END_TUNE",
- "W|IF_END_TUNE",
+ NULL,
+ NULL,
"Bww|SET_ADJ_NOUN",
"|SET_TIME",
/* 132 */
Modified: scummvm/trunk/engines/agos/script.cpp
===================================================================
--- scummvm/trunk/engines/agos/script.cpp 2006-10-25 10:08:38 UTC (rev 24494)
+++ scummvm/trunk/engines/agos/script.cpp 2006-10-25 10:20:17 UTC (rev 24495)
@@ -121,8 +121,6 @@
op[121] = &AGOSEngine::o_defObj;
op[125] = &AGOSEngine::o_here;
op[126] = &AGOSEngine::o_doClassIcons;
- op[128] = &AGOSEngine::o_waitEndTune;
- op[129] = &AGOSEngine::o_ifEndTune;
op[130] = &AGOSEngine::o_setAdjNoun;
op[132] = &AGOSEngine::o_saveUserGame;
op[133] = &AGOSEngine::o_loadUserGame;
@@ -858,17 +856,6 @@
mouseOn();
}
-void AGOSEngine::o_waitEndTune() {
- // 128: dummy instruction
- getVarOrWord();
-}
-
-void AGOSEngine::o_ifEndTune() {
- // 129: dummy instruction
- getVarOrWord();
- setScriptCondition(true);
-}
-
void AGOSEngine::o_setAdjNoun() {
// 130: set adj noun
uint var = getVarOrByte();
Modified: scummvm/trunk/engines/agos/script_e1.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_e1.cpp 2006-10-25 10:08:38 UTC (rev 24494)
+++ scummvm/trunk/engines/agos/script_e1.cpp 2006-10-25 10:20:17 UTC (rev 24495)
@@ -189,8 +189,6 @@
op[261] = &AGOSEngine::o_here;
op[262] = &AGOSEngine::o_doClassIcons;
op[263] = &AGOSEngine::o1_playTune;
- op[264] = &AGOSEngine::o_waitEndTune;
- op[265] = &AGOSEngine::o_ifEndTune;
op[266] = &AGOSEngine::o_setAdjNoun;
op[267] = &AGOSEngine::oe1_zoneDisk;
op[268] = &AGOSEngine::o_saveUserGame;
Modified: scummvm/trunk/engines/agos/subroutine.cpp
===================================================================
--- scummvm/trunk/engines/agos/subroutine.cpp 2006-10-25 10:08:38 UTC (rev 24494)
+++ scummvm/trunk/engines/agos/subroutine.cpp 2006-10-25 10:20:17 UTC (rev 24495)
@@ -215,8 +215,8 @@
}
}
- if (subroutine_id != 160)
- debug(0,"getSubroutineByID: subroutine %d not found", subroutine_id);
+ //if (subroutine_id != 160)
+ // debug(0,"getSubroutineByID: subroutine %d not found", subroutine_id);
return NULL;
}
@@ -312,6 +312,7 @@
p += 6;
while (min_num) {
+ //printf("loadTablesOldIntoMem: min %d max %d\n", min_num, max_num);
if ((subr_id >= min_num) && (subr_id <= max_num)) {
_subroutineList = _subroutineListOrg;
_tablesHeapPtr = _tablesHeapPtrOrg;
@@ -368,6 +369,7 @@
max_num = READ_BE_UINT16(p); p += 2;
+ //printf("loadTablesNewIntoMem: min %d max %d\n", min_num, max_num);
if (subr_id >= min_num && subr_id <= max_num) {
_subroutineList = _subroutineListOrg;
_tablesHeapPtr = _tablesHeapPtrOrg;
@@ -513,9 +515,12 @@
void AGOSEngine::runSubroutine101() {
Subroutine *sub;
- sub = getSubroutineByID(101);
- if (sub != NULL)
- startSubroutineEx(sub);
+ for (int i = 0; i < 1000000; i++) {
+ sub = getSubroutineByID(i);
+ if (sub != NULL)
+ startSubroutine(sub);
+ }
+ error("Complete");
permitInput();
}
@@ -537,9 +542,11 @@
_classMode1 = 0;
_classMode2 = 0;
- if (_startMainScript)
+ //if (_startMainScript)
dumpSubroutine(sub);
+ return 0;
+
if (++_recursionDepth > 40)
error("Recursion error");
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