Changeset 7564 for code/branches/ois_update/src/modules

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.

Location:

code/branches/ois_update/src/modules/questsystem

Files:

• QuestEffect.cc (modified) (1 diff)
• QuestEffectBeacon.cc (modified) (1 diff)
• effects/AddReward.cc (modified) (1 diff)

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

@@ -68 +68 @@
     /*static*/ bool QuestEffect::invokeEffects(PlayerInfo* player, std::list<QuestEffect*> & effects)
     {
-        bool check = true;
+        bool temp = true;
 
         COUT(4) << "Invoking QuestEffects on player: " << player << " ."  << std::endl;
 
         for (std::list<QuestEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++)
-            check = check && (*effect)->invoke(player);
+            temp = temp && (*effect)->invoke(player);
 
-        return check;
+        return temp;
     }
 

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.

code/branches/ois_update/src/modules/questsystem/effects/AddReward.cc

@@ -105 +105 @@
         COUT(5) << "AddReward on player: " << player << " ." << std::endl;
 
-        bool check = true;
+        bool temp = true;
         for ( std::list<Rewardable*>::iterator reward = this->rewards_.begin(); reward != this->rewards_.end(); ++reward )
-            check = check && (*reward)->reward(player);
+            temp = temp && (*reward)->reward(player);
 
         COUT(4) << "Rewardable successfully added to player." << player << " ." << std::endl;
 
-        return check;
+        return temp;
     }