thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #1746107 - Elvira 2: Crash Catacombs lev2.

Browse source 
svn-id: r27842
This commit is contained in:
Travis Howell 2007-07-01 23:57:49 +00:00
parent 3f82a451ef
commit d768edcd3a
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/agos/agos.h
View file

@ -1319,6 +1319,7 @@ public:
void oe2_pObj(); void oe2_pObj();
void oe2_isCalled(); void oe2_isCalled();
void oe2_loadGame(); void oe2_loadGame();
void oe2_menu();
void oe2_drawItem(); void oe2_drawItem();
void oe2_doTable(); void oe2_doTable();
void oe2_pauseGame(); void oe2_pauseGame();
@ -1412,7 +1413,6 @@ public:
void oww_setLongText(); void oww_setLongText();
void oww_printLongText(); void oww_printLongText();
void oww_whereTo(); void oww_whereTo();
void oww_menu();
void oww_textMenu(); void oww_textMenu();
void oww_pauseGame(); void oww_pauseGame();
void oww_boxMessage(); void oww_boxMessage();

7
engines/agos/script_e2.cpp
View file

@ -165,7 +165,7 @@ void AGOSEngine_Elvira2::setupOpcodes() {
OPCODE(o_cls), OPCODE(o_cls),
/* 104 */ /* 104 */
OPCODE(o_closeWindow), OPCODE(o_closeWindow),
OPCODE(o_invalid), OPCODE(oe2_menu),
OPCODE(o_invalid), OPCODE(o_invalid),
OPCODE(o_addBox), OPCODE(o_addBox),
/* 108 */ /* 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() { void AGOSEngine_Elvira2::oe2_drawItem() {
// 113: draw item // 113: draw item
Item *i = getNextItemPtr(); Item *i = getNextItemPtr();

7
engines/agos/script_ww.cpp
View file

@ -167,7 +167,7 @@ void AGOSEngine_Waxworks::setupOpcodes() {
OPCODE(o_cls), OPCODE(o_cls),
/* 104 */ /* 104 */
OPCODE(o_closeWindow), OPCODE(o_closeWindow),
OPCODE(oww_menu), OPCODE(oe2_menu),
OPCODE(oww_textMenu), OPCODE(oww_textMenu),
OPCODE(o_addBox), OPCODE(o_addBox),
/* 108 */ /* 108 */
@ -355,11 +355,6 @@ void AGOSEngine_Waxworks::oww_whereTo() {
_objectItem = derefItem(getExitOf(i, d)); _objectItem = derefItem(getExitOf(i, d));
} }
void AGOSEngine_Waxworks::oww_menu() {
// 105: set agos menu
_agosMenu = getVarOrByte();
}
void AGOSEngine_Waxworks::oww_textMenu() { void AGOSEngine_Waxworks::oww_textMenu() {
// 106: set text menu // 106: set text menu
byte slot = getVarOrByte(); byte slot = getVarOrByte();