[Orxonox-commit 1421] r6139 - in code/branches/presentation2/src: libraries/core orxonox/overlays

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-11-25 00:06:15 +0100 (Wed, 25 Nov 2009)
New Revision: 6139

Modified:
   code/branches/presentation2/src/libraries/core/Shell.cc
   code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc
Log:
Fixed a bug in Shell and changed parental order in InGameConsole.

Modified: code/branches/presentation2/src/libraries/core/Shell.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/Shell.cc	2009-11-24 02:16:12 UTC (rev 6138)
+++ code/branches/presentation2/src/libraries/core/Shell.cc	2009-11-24 23:06:15 UTC (rev 6139)
@@ -264,7 +264,12 @@
             if (this->bFinishedLastLine_)
             {
                 if (this->bPrependOutputLevel_)
-                    output.insert(0, 1, static_cast<char>(level));
+                {
+                    if (level == 0)
+                        output.insert(0, 1, static_cast<char>(-1));
+                    else
+                        output.insert(0, 1, static_cast<char>(level));
+                }
 
                 this->outputLines_.push_front(output);
 

Modified: code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc
===================================================================
--- code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc	2009-11-24 02:16:12 UTC (rev 6138)
+++ code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc	2009-11-24 23:06:15 UTC (rev 6139)
@@ -223,7 +223,7 @@
         this->consoleOverlayNoise_->setPosition(5,0);
         this->consoleOverlayNoise_->setMaterialName("ConsoleNoiseSmall");
         // comment following line to disable noise
-        this->consoleOverlayContainer_->addChild(this->consoleOverlayNoise_);
+        this->consoleOverlayBorder_->addChild(this->consoleOverlayNoise_);
 
         // create the text lines
         this->consoleOverlayTextAreas_ = new Ogre::TextAreaOverlayElement*[LINES];