aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2014-04-03 20:38:18 -0400
committerPaul Gilbert2014-04-03 20:38:18 -0400
commit83ac9489231e164154ad812034eb6aac9a0fe78b (patch)
treebfe22e2e616f3d61c02e601915de65d2dbb1300f
parent74c6bafed4eb80f93284a60219f27c150eb2baf5 (diff)
downloadscummvm-rg350-83ac9489231e164154ad812034eb6aac9a0fe78b.tar.gz
scummvm-rg350-83ac9489231e164154ad812034eb6aac9a0fe78b.tar.bz2
scummvm-rg350-83ac9489231e164154ad812034eb6aac9a0fe78b.zip
MADS: Renaming to use InterWaiting enum entries
-rw-r--r--engines/mads/action.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp
index b5c92c0d64..134d474e21 100644
--- a/engines/mads/action.cpp
+++ b/engines/mads/action.cpp
@@ -373,8 +373,9 @@ void MADSAction::checkActionAtMousePos() {
return;
case CAT_INV_LIST:
- case CAT_TALK_ENTRY:
- if (_interAwaiting != 3) {
+ case CAT_HOTSPOT:
+ case CAT_INV_ANIM:
+ if (_interAwaiting != AWAITING_THAT) {
if (userInterface._selectedActionIndex >= 0) {
_actionMode = ACTIONMODE_VERB;
_selectedRow = userInterface._selectedActionIndex;
@@ -404,7 +405,7 @@ void MADSAction::checkActionAtMousePos() {
}
switch (_interAwaiting) {
- case 1:
+ case AWAITING_COMMAND:
_articleNumber = 0;
switch (userInterface._category) {
case CAT_COMMAND:
@@ -453,7 +454,7 @@ void MADSAction::checkActionAtMousePos() {
}
break;
- case 2:
+ case AWAITING_THIS:
_articleNumber = 0;
switch (userInterface._category) {
case CAT_INV_LIST:
@@ -468,7 +469,7 @@ void MADSAction::checkActionAtMousePos() {
}
break;
- case 3:
+ case AWAITING_THAT:
switch (userInterface._category) {
case CAT_INV_LIST:
case CAT_HOTSPOT: