From c6935f2f69bba2e315cd7172ad86e22c6c02b0c0 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Tue, 6 Jan 2009 06:13:45 +0000
Subject: Fixed broken condition check for displaying dialogue balloons.

svn-id: r35748
---
 engines/parallaction/dialogue.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'engines')

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);
 	}
 };
 
-- 
cgit v1.2.3