Changeset 7911

Timestamp:

Feb 18, 2011, 12:08:00 AM (13 years ago)

Author:

landauf

Message:

Pong gametype should delete the objects it created

Location:

code/trunk/src/modules/pong

Files:

• Pong.cc (modified) (2 diffs)
• Pong.h (modified) (2 diffs)

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

@@ -60 +60 @@
 
         this->botclass_ = Class(PongBot);
+    }
+
+    Pong::~Pong()
+    {
+        if (this->isInitialized())
+            this->cleanup();
+    }
+
+    void Pong::cleanup()
+    {
+        if (this->ball_)
+        {
+            this->ball_->destroy();
+            this->ball_ = 0;
+        }
+
+        for (size_t i = 0; i < 2; ++i)
+        {
+            if (this->bat_[0])
+            {
+                this->bat_[0]->destroy();
+                this->bat_[0] = 0;
+            }
+        }
     }
 
@@ -123 +147 @@
     void Pong::end()
     {
-        if (this->ball_)
-        {
-            this->ball_->destroy();
-            this->ball_ = 0;
-        }
+        this->cleanup();
 
         Deathmatch::end();

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

@@ -41 +41 @@
         public:
             Pong(BaseObject* creator);
-            virtual ~Pong() {}
+            virtual ~Pong();
 
             virtual void start();
@@ -60 +60 @@
 
             void startBall();
+            void cleanup();
 
             WeakPtr<PongCenterpoint> center_;