Changeset 7852 for code/trunk

Timestamp:

Feb 10, 2011, 11:46:07 PM (14 years ago)

Author:

landauf

Message:

fixed crash in Pong gametype if the game was ended right after the ball was set back to center after a score

Location:

code/trunk/src/modules/pong

Files:

• Pong.h (modified) (1 diff)
• PongBall.cc (modified) (2 diffs)
• PongBall.h (modified) (2 diffs)

code/trunk/src/modules/pong/Pong.h

@@ -59 +59 @@
             void startBall();
 
-            PongCenterpoint* center_;
-            PongBall* ball_;
-            PongBat* bat_[2];
+            WeakPtr<PongCenterpoint> center_;
+            WeakPtr<PongBall> ball_;
+            WeakPtr<PongBat> bat_[2];
             Timer starttimer_;
     };

code/trunk/src/modules/pong/PongBall.cc

@@ -165 +165 @@
     }
 
-    void PongBall::setBats(PongBat** bats)
+    void PongBall::setBats(WeakPtr<PongBat>* bats)
     {
         this->bat_ = bats;
@@ -175 +175 @@
     {
         if (!this->bat_)
-            this->bat_ = new PongBat*[2];
+            this->bat_ = new WeakPtr<PongBat>[2]; // TODO: delete this somewhere
         if (this->batID_[0] != OBJECTID_UNKNOWN)
             this->bat_[0] = orxonox_cast<PongBat*>(Synchronisable::getSynchronisable(this->batID_[0]));

code/trunk/src/modules/pong/PongBall.h

@@ -66 +66 @@
                 { return this->batlength_; }
 
-            void setBats(PongBat** bats);
+            void setBats(WeakPtr<PongBat>* bats);
             void applyBats();
 
@@ -79 +79 @@
             float accelerationFactor_;
             float batlength_;
-            PongBat** bat_;
+            WeakPtr<PongBat>* bat_;
             unsigned int* batID_;
             float relMercyOffset_;