mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-13 21:31:53 +00:00
Minor cleanup.
svn-id: r31514
This commit is contained in:
parent
943c337815
commit
ee89c3000b
@ -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();
|
||||
|
@ -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 */
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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();
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user