[Scummvm-cvs-logs] SF.net SVN: scummvm:[35748] scummvm/trunk/engines/parallaction/dialogue.cpp

[peres001 at users.sourceforge.net]

Revision: 35748
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35748&view=rev
Author:   peres001
Date:     2009-01-06 06:13:45 +0000 (Tue, 06 Jan 2009)

Log Message:
-----------
Fixed broken condition check for displaying dialogue balloons.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/dialogue.cpp

Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp	2009-01-05 20:17:33 UTC (rev 35747)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp	2009-01-06 06:13:45 UTC (rev 35748)
@@ -148,14 +148,6 @@
 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 @@
 		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);
 	}
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.