Changeset 7564 for code/branches/ois_update/src/modules/questsystem/QuestEffectBeacon.cc

Timestamp:

Oct 19, 2010, 11:43:25 PM (14 years ago)

Author:

rgrieder

Message:

Renamed all symbols called "check" because of macro collisions on OS X.
Inserted something like an assert in btGjkPairDetector.cpp with the hope that I don't have to modify that 'check' there.

File:

• code/branches/ois_update/src/modules/questsystem/QuestEffectBeacon.cc (modified) (1 diff)

code/branches/ois_update/src/modules/questsystem/QuestEffectBeacon.cc

@@ -154 +154 @@
         COUT(4) << "QuestEffectBeacon executed on player: " << player << " ." << std::endl;
 
-        bool check = QuestEffect::invokeEffects(player, this->effects_); // Invoke the QuestEffects on the PlayerInfo.
-        if(check)
+        bool temp = QuestEffect::invokeEffects(player, this->effects_); // Invoke the QuestEffects on the PlayerInfo.
+        if(temp)
         {
             this->decrementTimes(); // Decrement the number of times the beacon can be used.