Changeset 5818

Timestamp:

Sep 27, 2009, 10:26:49 PM (15 years ago)

Author:

rgrieder

Message:

Small bugfix for the second to last commit: InputStates only exist in graphics mode.
And added destruction code for the ScoreBoard.

Location:

code/branches/core5/src

Files:

• libraries/core/SubclassIdentifier.h (modified) (1 diff)
• modules/gamestates/GSLevel.cc (modified) (2 diffs)
• modules/overlays/stats/Scoreboard.cc (modified) (1 diff)
• modules/overlays/stats/Scoreboard.h (modified) (1 diff)

code/branches/core5/src/libraries/core/SubclassIdentifier.h

@@ -38 +38 @@
 #define _SubclassIdentifier_H__
 
-#include <cstdlib>
-
 #include "CorePrereqs.h"
 
+#include <cstdlib>
 #include "util/Debug.h"
 #include "Identifier.h"

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

@@ -196 +196 @@
         if (this->scope_GSLevel_)
         {
-            InputManager::getInstance().destroyState("guiKeysOnly");
-            InputManager::getInstance().destroyState("guiMouseOnly");
             delete this->scope_GSLevel_;
             this->scope_GSLevel_ = NULL;
@@ -208 +206 @@
             guiKeysOnlyInputState_->setHandler(0);
             InputManager::getInstance().destroyState("game");
+            InputManager::getInstance().destroyState("guiKeysOnly");
+            InputManager::getInstance().destroyState("guiMouseOnly");
             if (this->keyBinder_)
             {

code/branches/core5/src/modules/overlays/stats/Scoreboard.cc

@@ -44 +44 @@
     {
         RegisterObject(Scoreboard);
+    }
+
+    Scoreboard::~Scoreboard()
+    {
+        while (this->lines_.size() > 0)
+        {
+            // destroy lines
+            delete this->lines_.back();
+            this->lines_.pop_back();
+        }
     }
 

code/branches/core5/src/modules/overlays/stats/Scoreboard.h

@@ -42 +42 @@
     public: // functions
         Scoreboard(BaseObject* creator);
-        virtual ~Scoreboard() {}
+        virtual ~Scoreboard();
 
         virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);