Changeset 5757 for code/trunk

Timestamp:

Sep 20, 2009, 9:58:59 PM (15 years ago)

Author:

dafrick

Message:

Fixed issues with GUI. The problem was, that the Owner of the GUIOverlay is set properly only after it is constructed and thus was NULL. Now the player gets updated whenever toggleVisibility is called. Also getOwner() no longer returns a PlayerInfo* it returns a ControllableEntity*, so that had to be adjusted to as well.

Location:

code/trunk

Files:

• data/overlays/hudtemplates3.oxo (modified) (1 diff)
• src/modules/overlays/GUIOverlay.cc (modified) (3 diffs)

code/trunk/data/overlays/hudtemplates3.oxo

@@ -96 +96 @@
     />
 
+    <GUIOverlay
+      name = "QuestGUI"
+      guiname = "QuestGUI"
+    />
+
   </OverlayGroup>
 </Template>

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

@@ -37 +37 @@
 #include "core/XMLPort.h"
 #include "infos/PlayerInfo.h"
+#include "worldentities/ControllableEntity.h"
 
 namespace orxonox
@@ -62 +63 @@
         SUPER(GUIOverlay, changedVisibility);
 
+        //Setting player now.
+        GUIManager::getInstance().setPlayer(this->guiName_, (orxonox_cast<ControllableEntity*>(this->getOwner()))->getPlayer());
+
         if (this->isVisible())
         {
@@ -83 +87 @@
     {
         this->guiName_ = name;
-        GUIManager::getInstance().setPlayer(name, orxonox_cast<PlayerInfo*>(this->getOwner()));
+        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.
     }
 }