aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/agos.cpp
diff options
context:
space:
mode:
authorTravis Howell2006-10-16 11:20:20 +0000
committerTravis Howell2006-10-16 11:20:20 +0000
commita833a2fb8e68e994d35f37317ac74da0dd931656 (patch)
treee10cbaaa73820c18406dfcf4ceeacdf2f9fcd3d5 /engines/agos/agos.cpp
parenta965e8140c166940f691b85d62c69272a6efefe2 (diff)
downloadscummvm-rg350-a833a2fb8e68e994d35f37317ac74da0dd931656.tar.gz
scummvm-rg350-a833a2fb8e68e994d35f37317ac74da0dd931656.tar.bz2
scummvm-rg350-a833a2fb8e68e994d35f37317ac74da0dd931656.zip
Enable menus in Elvira 2
svn-id: r24349
Diffstat (limited to 'engines/agos/agos.cpp')
-rw-r--r--engines/agos/agos.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 855eed5af2..d5158290c3 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -712,6 +712,7 @@ void AGOSEngine::setupGame() {
_stringIdLocalMin = 1;
+ _agosMenu = 1;
_superRoomNumber = 1;
for (int i = 0; i < 20; i++) {
@@ -1173,6 +1174,9 @@ void AGOSEngine::setup_cond_c_helper() {
_noRightClick = 1;
+ if (getGameType() == GType_WW)
+ clearMenuStrip();
+
if (getGameType() == GType_FF) {
int cursor = 5;
int animMax = 16;
@@ -1423,8 +1427,10 @@ startOver:
break;
}
- if (getGameType() == GType_WW)
- doMenuStrip(menuFor(ha->item_ptr, id));
+ if (getGameType() == GType_ELVIRA2)
+ doMenuStrip(menuFor_e2(ha->item_ptr, id));
+ else if (getGameType() == GType_WW)
+ doMenuStrip(menuFor_ww(ha->item_ptr, id));
} else {
// else 1
if (ha->verb == 0) {
@@ -1443,6 +1449,9 @@ startOver:
}
}
+ if (getGameType() == GType_ELVIRA2 || getGameType() == GType_WW)
+ clearMenuStrip();
+
_needHitAreaRecalc++;
}