Changeset 5799

Timestamp:

Sep 26, 2009, 10:19:14 PM (15 years ago)

Author:

landauf

Message:

replaced delete with destroy() in gamestates

Location:

code/branches/core5/src/modules/gamestates

Files:

• GSGraphics.cc (modified) (2 diffs)
• GSLevel.cc (modified) (3 diffs)
• GSMainMenu.cc (modified) (2 diffs)
• GSRoot.cc (modified) (1 diff)

code/branches/core5/src/modules/gamestates/GSGraphics.cc

@@ -74 +74 @@
     {
         InputManager::getInstance().destroyState("master");
-        delete this->masterKeyBinder_;
+        this->masterKeyBinder_->destroy();
     }
 
@@ -134 +134 @@
 */
 
-        delete this->console_;
+        this->console_->destroy();
 
         Loader::unload(this->debugOverlay_);
         delete this->debugOverlay_;
 
-        delete this->soundManager_;
+        this->soundManager_->destroy();
 
         // HACK: (destroys a resource smart pointer)

code/branches/core5/src/modules/gamestates/GSLevel.cc

@@ -188 +188 @@
         if (this->radar_)
         {
-            delete this->radar_;
+            this->radar_->destroy();
             this->radar_ = 0;
         }
@@ -200 +200 @@
         if (this->playerManager_)
         {
-            delete this->playerManager_;
+            this->playerManager_->destroy();
             this->playerManager_ = 0;
         }
@@ -218 +218 @@
             if (this->keyBinder_)
             {
-                delete this->keyBinder_;
+                this->keyBinder_->destroy();
                 this->keyBinder_ = 0;
             }

code/branches/core5/src/modules/gamestates/GSMainMenu.cc

@@ -65 +65 @@
 
         this->scene_->getSceneManager()->destroyCamera(this->camera_);
-        delete this->scene_;
+        this->scene_->destroy();
     }
 
@@ -108 +108 @@
     void GSMainMenu::deactivate()
     {
-        delete this->ambient_;
+        this->ambient_->destroy();
 
         InputManager::getInstance().leaveState("mainMenu");

code/branches/core5/src/modules/gamestates/GSRoot.cc

@@ -99 +99 @@
 */
 
-        delete this->levelManager_;
+        this->levelManager_->destroy();
     }