Changeset 6122 for code

Timestamp:

Nov 23, 2009, 8:10:03 PM (15 years ago)

Author:

rgrieder

Message:

Fixed dedicated problem in NHC and a memory leak on windows in the IOConsole.

Location:

code/branches/presentation2/src

Files:

• libraries/core/IOConsole.cc (modified) (1 diff)
• orxonox/controllers/NewHumanController.cc (modified) (4 diffs)

code/branches/presentation2/src/libraries/core/IOConsole.cc

@@ -484 +484 @@
     IOConsole::~IOConsole()
     {
+//        resetTerminalMode();
+        this->shell_->destroy();
+
 /*
-        resetTerminalMode();
-        this->shell_->destroy();
-
         // Enable standard this->cout_ logging again
         OutputHandler::getInstance().enableCout();

code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc

@@ -52 +52 @@
     NewHumanController* NewHumanController::localController_s = 0;
 
-    NewHumanController::NewHumanController(BaseObject* creator) : HumanController(creator)
+    NewHumanController::NewHumanController(BaseObject* creator)
+        : HumanController(creator)
+        , crossHairOverlay_(NULL)
     {
         RegisterObject(NewHumanController);
@@ -59 +61 @@
         controlMode_ = 0;
 
-        crossHairOverlay_ = new OrxonoxOverlay(this);
-        crossHairOverlay_->setBackgroundMaterial("Orxonox/Crosshair3");
-        crossHairOverlay_->setSize(Vector2(overlaySize_, overlaySize_));
-        crossHairOverlay_->show();
+        if (GameMode::showsGraphics())
+        {
+            crossHairOverlay_ = new OrxonoxOverlay(this);
+            crossHairOverlay_->setBackgroundMaterial("Orxonox/Crosshair3");
+            crossHairOverlay_->setSize(Vector2(overlaySize_, overlaySize_));
+            crossHairOverlay_->show();
+        }
 
         // HACK: Define which objects are targetable when considering the creator of an orxonox::Model
@@ -76 +81 @@
         if (this->isInitialized())
         {
+            if (this->crossHairOverlay_)
+                this->crossHairOverlay_->destroy();
         }
     }
@@ -81 +88 @@
     void NewHumanController::tick(float dt)
     {
-        if( this->controllableEntity_ && !this->controllableEntity_->isInMouseLook() )
-        {
-            this->crossHairOverlay_->setPosition(Vector2(static_cast<float>(this->currentYaw_)/2*-1+.5-overlaySize_/2, static_cast<float>(this->currentPitch_)/2*-1+.5-overlaySize_/2));
-            this->crossHairOverlay_->show();
-        }
-        else
-            this->crossHairOverlay_->hide();
-        // TODO: update aimPosition of Pawn
+        if (GameMode::showsGraphics())
+        {
+            if( this->controllableEntity_ && !this->controllableEntity_->isInMouseLook() )
+            {
+                this->crossHairOverlay_->setPosition(Vector2(static_cast<float>(this->currentYaw_)/2*-1+.5-overlaySize_/2, static_cast<float>(this->currentPitch_)/2*-1+.5-overlaySize_/2));
+                this->crossHairOverlay_->show();
+            }
+            else
+                this->crossHairOverlay_->hide();
+            // TODO: update aimPosition of Pawn
+        }
 
         HumanController::tick(dt);