Changeset 1578 for code/trunk

Timestamp:

Jun 9, 2008, 6:29:19 PM (17 years ago)

Author:

rgrieder

Message:

gcc and msvc don't always see eye to eye, fortunately…
Also created new config value for cursor symbol.

Location:

code/trunk/src/orxonox/console

Files:

• InGameConsole.cc (modified) (3 diffs)
• InGameConsole.h (modified) (2 diffs)

code/trunk/src/orxonox/console/InGameConsole.cc

@@ -104 +104 @@
         SetConfigValue(scrollSpeed_, 3.0f);
         SetConfigValue(noiseSize_, 1.0f);
+        SetConfigValue(cursorSymbol_, '|');
     }
 
@@ -152 +153 @@
 
         // create cursor (also a text area overlay element)
-        this->consoleOverlayCursor_ = static_cast<TextAreaOverlayElement*>(ovMan->createOverlayElement("TextArea", "InGameConsoleTextArea" + Ogre::StringConverter::toString(i)));
+        this->consoleOverlayCursor_ = static_cast<TextAreaOverlayElement*>(ovMan->createOverlayElement("TextArea", "InGameConsoleCursor"));
         this->consoleOverlayCursor_->setMetricsMode(Ogre::GMM_PIXELS);
         this->consoleOverlayCursor_->setFontName("Monofur");
@@ -158 +159 @@
         this->consoleOverlayCursor_->setParameter("colour_top", "0.21 0.69 0.21");
         this->consoleOverlayCursor_->setLeft(7);
-        this->consoleOverlayCursor_->setCaption("|");
+        this->consoleOverlayCursor_->setCaption(std::string(this->cursorSymbol_, 1));
         this->consoleOverlayContainer_->addChild(this->consoleOverlayCursor_);
 

code/trunk/src/orxonox/console/InGameConsole.h

@@ -89 +89 @@
             float cursor_;
             unsigned int inputWindowStart_;
-            char cursorSymbol_;
             bool bShowCursor_;
             std::string displayedText_;
@@ -105 +104 @@
             float scrollSpeed_;
             float noiseSize_;
+            char cursorSymbol_;
     };
 }