Changeset 5929 for code/trunk/src/orxonox/infos

Timestamp:

Oct 12, 2009, 8:20:07 PM (15 years ago)

Author:

rgrieder

Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/infos/HumanPlayer.cc (modified) (5 diffs)
• src/orxonox/infos/PlayerInfo.cc (modified) (3 diffs)
• src/orxonox/infos/PlayerInfo.h (modified) (1 diff)

code/trunk/src/orxonox/infos/HumanPlayer.cc

@@ -64 +64 @@
         {
             if (this->humanHud_)
-                delete this->humanHud_;
+                this->humanHud_->destroy();
 
             if (this->gametypeHud_)
-                delete this->gametypeHud_;
+                this->gametypeHud_->destroy();
         }
     }
@@ -116 +116 @@
 
             if (!GameMode::isMaster())
-                this->setObjectMode(ObjectDirection::Bidirectional);
+                this->setSyncMode(ObjectDirection::Bidirectional);
             else
                 this->setName(this->nick_);
@@ -162 +162 @@
 
         if (this->isInitialized() && this->isLocalPlayer())
-            if (this->getGametype()->getHUDTemplate() != "")
+        {
+            if (this->getGametype() && this->getGametype()->getHUDTemplate() != "")
                 this->setGametypeHUDTemplate(this->getGametype()->getHUDTemplate());
+            else
+                this->setGametypeHUDTemplate("");
+        }
     }
 
@@ -170 +174 @@
         if (this->humanHud_)
         {
-            delete this->humanHud_;
+            this->humanHud_->destroy();
             this->humanHud_ = 0;
         }
 
-        if (this->isLocalPlayer() && this->humanHudTemplate_ != "")
+        if (this->isLocalPlayer() && this->humanHudTemplate_ != "" && GameMode::showsGraphics())
         {
             this->humanHud_ = new OverlayGroup(this);
@@ -186 +190 @@
         if (this->gametypeHud_)
         {
-            delete this->gametypeHud_;
+            this->gametypeHud_->destroy();
             this->gametypeHud_ = 0;
         }

code/trunk/src/orxonox/infos/PlayerInfo.cc

@@ -35 +35 @@
 #include "gametypes/Gametype.h"
 #include "worldentities/ControllableEntity.h"
+#include "controllers/Controller.h"
 
 namespace orxonox
@@ -66 +67 @@
             if (this->controller_)
             {
-                delete this->controller_;
+                this->controller_->destroy();
                 this->controller_ = 0;
             }
@@ -131 +132 @@
         if (this->controller_)
         {
-            delete this->controller_;
+            this->controller_->destroy();
             this->controller_ = 0;
         }

code/trunk/src/orxonox/infos/PlayerInfo.h

@@ -33 +33 @@
 
 #include "Info.h"
-#include "core/Identifier.h"
-#include "controllers/Controller.h"
+#include "core/SubclassIdentifier.h"
 
 namespace orxonox