diff options
| author | Travis Howell | 2007-07-01 23:57:49 +0000 |
|---|---|---|
| committer | Travis Howell | 2007-07-01 23:57:49 +0000 |
| commit | d768edcd3aa7c743784c4bb7d755a11807f05dda (patch) | |
| tree | 3f5569d41c0add3804001d7f9abf8084fa88ea4c /engines/agos | |
| parent | 3f82a451efa0d1e4ee409de4b074cbf9e4662aa4 (diff) | |
| download | scummvm-rg350-d768edcd3aa7c743784c4bb7d755a11807f05dda.tar.gz scummvm-rg350-d768edcd3aa7c743784c4bb7d755a11807f05dda.tar.bz2 scummvm-rg350-d768edcd3aa7c743784c4bb7d755a11807f05dda.zip | |
Fix bug #1746107 - Elvira 2: Crash Catacombs lev2.
svn-id: r27842
Diffstat (limited to 'engines/agos')
| -rw-r--r-- | engines/agos/agos.h | 2 | ||||
| -rw-r--r-- | engines/agos/script_e2.cpp | 7 | ||||
| -rw-r--r-- | engines/agos/script_ww.cpp | 7 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/agos/agos.h b/engines/agos/agos.h index 8841057925..d233d0bfeb 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -1319,6 +1319,7 @@ public: void oe2_pObj(); void oe2_isCalled(); void oe2_loadGame(); + void oe2_menu(); void oe2_drawItem(); void oe2_doTable(); void oe2_pauseGame(); @@ -1412,7 +1413,6 @@ public: void oww_setLongText(); void oww_printLongText(); void oww_whereTo(); - void oww_menu(); void oww_textMenu(); void oww_pauseGame(); void oww_boxMessage(); diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp index 61655e63f9..0ddb982d3a 100644 --- a/engines/agos/script_e2.cpp +++ b/engines/agos/script_e2.cpp @@ -165,7 +165,7 @@ void AGOSEngine_Elvira2::setupOpcodes() { OPCODE(o_cls), /* 104 */ OPCODE(o_closeWindow), - OPCODE(o_invalid), + OPCODE(oe2_menu), OPCODE(o_invalid), OPCODE(o_addBox), /* 108 */ @@ -333,6 +333,11 @@ void AGOSEngine_Elvira2::oe2_loadGame() { } } +void AGOSEngine_Elvira2::oe2_menu() { + // 105: set agos menu + _agosMenu = getVarOrByte(); +} + void AGOSEngine_Elvira2::oe2_drawItem() { // 113: draw item Item *i = getNextItemPtr(); diff --git a/engines/agos/script_ww.cpp b/engines/agos/script_ww.cpp index 3fa9e92687..fc472fd3c3 100644 --- a/engines/agos/script_ww.cpp +++ b/engines/agos/script_ww.cpp @@ -167,7 +167,7 @@ void AGOSEngine_Waxworks::setupOpcodes() { OPCODE(o_cls), /* 104 */ OPCODE(o_closeWindow), - OPCODE(oww_menu), + OPCODE(oe2_menu), OPCODE(oww_textMenu), OPCODE(o_addBox), /* 108 */ @@ -355,11 +355,6 @@ void AGOSEngine_Waxworks::oww_whereTo() { _objectItem = derefItem(getExitOf(i, d)); } -void AGOSEngine_Waxworks::oww_menu() { - // 105: set agos menu - _agosMenu = getVarOrByte(); -} - void AGOSEngine_Waxworks::oww_textMenu() { // 106: set text menu byte slot = getVarOrByte(); |