Changeset 6412 for code/branches/pickup2/src/modules/pong

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/modules/pong/Pong.cc (modified) (2 diffs)
• src/modules/pong/PongAI.cc (modified) (5 diffs)
• src/modules/pong/PongBall.cc (modified) (1 diff)
• src/modules/pong/PongScore.cc (modified) (2 diffs)

code/branches/pickup2/src/modules/pong/Pong.cc

@@ -42 +42 @@
     CreateEventName(PongCenterpoint, right);
     CreateEventName(PongCenterpoint, left);
-    
+
     CreateUnloadableFactory(Pong);
 
@@ -164 +164 @@
             else if (player == this->getLeftPlayer())
                 this->center_->fireEvent(FireEventName(PongCenterpoint, left));
-            
+
             if (player)
                 this->gtinfo_->sendAnnounceMessage(player->getName() + " scored");

code/branches/pickup2/src/modules/pong/PongAI.cc

@@ -62 +62 @@
     {
         for (std::list<std::pair<Timer*, char> >::iterator it = this->reactionTimers_.begin(); it != this->reactionTimers_.end(); ++it)
-            (*it).first->destroy();
+            it->first->destroy();
     }
 
@@ -131 +131 @@
                 this->bOscillationAvoidanceActive_ = false;
             }
-            
+
             // If the ball is close enough, calculate another random offset to accelerate the ball
             if (!this->bChangedRandomOffset_)
@@ -206 +206 @@
             // calculate the time until the ball reaches the other side
             float totaltime = (-position.x + dimension.x / 2 * sgn(velocity.x)) / velocity.x;
-            
+
             // calculate wall bounce position (four possible solutions of the equation: pos.z + vel.z*t + acc.z/2*t^2 = +/- dim.z/2)
             float bouncetime = totaltime;
             bool bUpperWall = false;
-            
+
             if (acceleration.z == 0)
             {
@@ -270 +270 @@
                 // ball bounces after <bouncetime> seconds, update the position and continue
                 velocity.z = velocity.z + acceleration.z * bouncetime;
-                
+
                 if (bUpperWall)
                 {
@@ -281 +281 @@
                     velocity.z = fabs(velocity.z) - fabs(randomErrorZ);
                 }
-                    
+
                 position.x = position.x + velocity.x * bouncetime + randomErrorX;
                 this->ballEndPosition_ = position.z;

code/branches/pickup2/src/modules/pong/PongBall.cc

@@ -105 +105 @@
                         velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
                         acceleration = this->bat_[1]->getVelocity() * this->accelerationFactor_ * -1;
-                        
+
                         this->fireEvent();
                     }

code/branches/pickup2/src/modules/pong/PongScore.cc

@@ -77 +77 @@
             std::string name2;
 
-            std::string score1 = "0";
-            std::string score2 = "0";
+            std::string score1("0");
+            std::string score2("0");
 
             if (player1)
@@ -114 +114 @@
             }
 
-            std::string output = "PONG";
+            std::string output("PONG");
             if (this->bShowName_ || this->bShowScore_)
             {
                 if (this->bShowLeftPlayer_ && this->bShowRightPlayer_)
-                    output = output1 + ":" + output2;
+                    output = output1 + ':' + output2;
                 else if (this->bShowLeftPlayer_ || this->bShowRightPlayer_)
                     output = output1 + output2;