Changeset 6753

Timestamp:

Apr 19, 2010, 11:14:32 AM (14 years ago)

Author:

rgrieder

Message:

Some more hackery for the PlayerInfo↔GUIOverlay relation.
Seems to work now mostly. But I still get a segfault when I pick up the red one and the PickupInventory doesn't disappear with the "Back" button.

Location:

code/trunk/src

Files:

• modules/overlays/GUIOverlay.cc (modified) (2 diffs)
• modules/overlays/GUIOverlay.h (modified) (1 diff)
• orxonox/overlays/OrxonoxOverlay.h (modified) (1 diff)

code/trunk/src/modules/overlays/GUIOverlay.cc

@@ -64 +64 @@
 
         //Setting player now.
-        if( this->getOwner() )
-            GUIManager::getInstance().setPlayer(this->guiName_, (orxonox_cast<ControllableEntity*>(this->getOwner()))->getPlayer());
+        if (this->getOwner())
+        {
+            ControllableEntity* entity = orxonox_cast<ControllableEntity*>(this->getOwner());
+            if (entity)
+                GUIManager::getInstance().setPlayer(this->guiName_, entity->getPlayer());
+        }
 
         if (this->isVisible())
@@ -87 +91 @@
     {
         this->guiName_ = name;
-        GUIManager::getInstance().setPlayer(name, orxonox_cast<PlayerInfo*>(this->getOwner())); //Set Player is going to be NULL, so it needs to be set in changedVisibility() as well.
+        if (this->getOwner())
+        {
+            ControllableEntity* entity = orxonox_cast<ControllableEntity*>(this->getOwner());
+            if (entity)
+                GUIManager::getInstance().setPlayer(name, entity->getPlayer()); //Set Player is going to be NULL, so it needs to be set in changedVisibility() as well.
+        }
+    }
+
+    void GUIOverlay::changedOwner()
+    {
+        SUPER(GUIOverlay, changedOwner);
+        if (!this->getGUIName().empty())
+            this->setGUIName(this->getGUIName());
     }
 }

code/trunk/src/modules/overlays/GUIOverlay.h

@@ -50 +50 @@
 
             virtual void changedVisibility();
+            virtual void changedOwner();
 
         private:

code/trunk/src/orxonox/overlays/OrxonoxOverlay.h

@@ -42 +42 @@
 #include "util/OgreForwardRefs.h"
 #include "core/BaseObject.h"
+#include "core/Super.h"
 #include "core/WindowEventListener.h"