[Orxonox-commit 1125] r5846 - in code/branches/core5/src/orxonox: infos worldentities

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-10-01 11:07:57 +0200 (Thu, 01 Oct 2009)
New Revision: 5846

Modified:
   code/branches/core5/src/orxonox/infos/HumanPlayer.cc
   code/branches/core5/src/orxonox/worldentities/ControllableEntity.cc
Log:
two fixes to prepare the dedicatedClient


Modified: code/branches/core5/src/orxonox/infos/HumanPlayer.cc
===================================================================
--- code/branches/core5/src/orxonox/infos/HumanPlayer.cc	2009-10-01 07:52:39 UTC (rev 5845)
+++ code/branches/core5/src/orxonox/infos/HumanPlayer.cc	2009-10-01 09:07:57 UTC (rev 5846)
@@ -177,7 +177,7 @@
             this->humanHud_ = 0;
         }
 
-        if (this->isLocalPlayer() && this->humanHudTemplate_ != "")
+        if (this->isLocalPlayer() && this->humanHudTemplate_ != "" && GameMode::showsGraphics())
         {
             this->humanHud_ = new OverlayGroup(this);
             this->humanHud_->addTemplate(this->humanHudTemplate_);

Modified: code/branches/core5/src/orxonox/worldentities/ControllableEntity.cc
===================================================================
--- code/branches/core5/src/orxonox/worldentities/ControllableEntity.cc	2009-10-01 07:52:39 UTC (rev 5845)
+++ code/branches/core5/src/orxonox/worldentities/ControllableEntity.cc	2009-10-01 09:07:57 UTC (rev 5846)
@@ -274,7 +274,7 @@
 
     void ControllableEntity::startLocalHumanControl()
     {
-        if (!this->camera_)
+        if (!this->camera_ && GameMode::showsGraphics())
         {
             this->camera_ = new Camera(this);
             this->camera_->requestFocus();
@@ -286,7 +286,7 @@
                 this->camera_->attachToNode(this->cameraPositionRootNode_);
         }
 
-        if (!this->hud_)
+        if (!this->hud_ && GameMode::showsGraphics())
         {
             if (this->hudtemplate_ != "")
             {