diff options
| author | Travis Howell | 2008-04-16 12:24:09 +0000 |
|---|---|---|
| committer | Travis Howell | 2008-04-16 12:24:09 +0000 |
| commit | ee89c3000bbc7cc762edcc9abd9412703e464fbf (patch) | |
| tree | bb2126e2f5eecc7ee90e3331d23210d2c8b6b513 /engines | |
| parent | 943c3378153265c9404ea847b6d132240a699296 (diff) | |
| download | scummvm-rg350-ee89c3000bbc7cc762edcc9abd9412703e464fbf.tar.gz scummvm-rg350-ee89c3000bbc7cc762edcc9abd9412703e464fbf.tar.bz2 scummvm-rg350-ee89c3000bbc7cc762edcc9abd9412703e464fbf.zip | |
Minor cleanup.
svn-id: r31514
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/agos/agos.h | 1 | ||||
| -rw-r--r-- | engines/agos/debug.h | 4 | ||||
| -rw-r--r-- | engines/agos/script_e1.cpp | 2 | ||||
| -rw-r--r-- | engines/agos/script_e2.cpp | 13 | ||||
| -rw-r--r-- | engines/agos/script_ww.cpp | 2 |
5 files changed, 5 insertions, 17 deletions
diff --git a/engines/agos/agos.h b/engines/agos/agos.h index fc5dcba586..1d5eda8392 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -1320,7 +1320,6 @@ public: void oe2_doClass(); void oe2_pObj(); void oe2_isCalled(); - void oe2_loadGame(); void oe2_menu(); void oe2_drawItem(); void oe2_doTable(); diff --git a/engines/agos/debug.h b/engines/agos/debug.h index 58718968a4..e2f0559057 100644 --- a/engines/agos/debug.h +++ b/engines/agos/debug.h @@ -501,7 +501,7 @@ static const char *const elvira2_opcodeNameTable[256] = { "W|COMMENT", /* 88 */ "|STOP_ANIMATION", - "T|LOAD_USER_GAME", + "T|LOAD_GAME", "IB|GET_PARENT", "IB|GET_NEXT", /* 92 */ @@ -734,7 +734,7 @@ static const char *const waxworks_opcodeNameTable[256] = { "W|COMMENT", /* 88 */ "|STOP_ANIMATION", - "T|LOAD_USER_GAME", + "T|LOAD_GAME", "IB|GET_PARENT", "IB|GET_NEXT", /* 92 */ diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp index f95ee3b47a..94df21979c 100644 --- a/engines/agos/script_e1.cpp +++ b/engines/agos/script_e1.cpp @@ -693,7 +693,7 @@ void AGOSEngine_Elvira1::oe1_doorExit() { } void AGOSEngine_Elvira1::oe1_loadGame() { - // 202: load game + // 202: load restart state uint16 stringId = getNextStringID(); loadGame((const char *)getStringPtrByID(stringId), true); } diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp index 7713a68141..da9afc5a7d 100644 --- a/engines/agos/script_e2.cpp +++ b/engines/agos/script_e2.cpp @@ -145,7 +145,7 @@ void AGOSEngine_Elvira2::setupOpcodes() { OPCODE(o_comment), /* 88 */ OPCODE(o_invalid), - OPCODE(oe2_loadGame), + OPCODE(oe1_loadGame), OPCODE(o_getParent), OPCODE(o_getNext), /* 92 */ @@ -322,17 +322,6 @@ void AGOSEngine_Elvira2::oe2_isCalled() { 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(); diff --git a/engines/agos/script_ww.cpp b/engines/agos/script_ww.cpp index fe21baf9bb..5fd83312c3 100644 --- a/engines/agos/script_ww.cpp +++ b/engines/agos/script_ww.cpp @@ -147,7 +147,7 @@ void AGOSEngine_Waxworks::setupOpcodes() { OPCODE(o_comment), /* 88 */ OPCODE(o_invalid), - OPCODE(oe2_loadGame), + OPCODE(oe1_loadGame), OPCODE(o_getParent), OPCODE(o_getNext), /* 92 */ |