aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorNicola Mettifogo2009-01-06 06:13:45 +0000
committerNicola Mettifogo2009-01-06 06:13:45 +0000
commitc6935f2f69bba2e315cd7172ad86e22c6c02b0c0 (patch)
tree5465a16f9c80bdad617c97cefe04c632763548bd /engines
parentad3ee3680578da0f02c58dbeebc017b0b8b44c55 (diff)
downloadscummvm-rg350-c6935f2f69bba2e315cd7172ad86e22c6c02b0c0.tar.gz
scummvm-rg350-c6935f2f69bba2e315cd7172ad86e22c6c02b0c0.tar.bz2
scummvm-rg350-c6935f2f69bba2e315cd7172ad86e22c6c02b0c0.zip
Fixed broken condition check for displaying dialogue balloons.
svn-id: r35748
Diffstat (limited to 'engines')
-rw-r--r--engines/parallaction/dialogue.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index b210fcc788..be0e54e5cc 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -148,14 +148,6 @@ public:
class DialogueManager_br : public DialogueManager {
Parallaction_br *_vm;
- bool testAnswerCounter(Answer *a) {
- if (!a->_hasCounterCondition) {
- return true;
- }
- _vm->testCounterCondition(a->_counterName, a->_counterOp, a->_counterValue);
- return (_vm->getLocationFlags() & kFlagsTestTrue) != 0;
- }
-
public:
DialogueManager_br(Parallaction_br *vm, ZonePtr z) : DialogueManager(vm, z), _vm(vm) {
}
@@ -164,11 +156,12 @@ public:
if (!a)
return false;
- if (testAnswerFlags(a)) {
- return true;
+ if (a->_hasCounterCondition) {
+ _vm->testCounterCondition(a->_counterName, a->_counterOp, a->_counterValue);
+ return (_vm->getLocationFlags() & kFlagsTestTrue) != 0;
}
- return testAnswerCounter(a);
+ return testAnswerFlags(a);
}
};