Changeset 1181

Timestamp:

Apr 24, 2008, 7:14:54 PM (17 years ago)

Author:

FelixSchulthess

Message:

fiddling with umlauts

Location:

code/branches/console/src/orxonox/console

Files:

• InGameConsole.cc (modified) (6 diffs)
• InGameConsole.h (modified) (1 diff)

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

@@ -68 +68 @@
     void InGameConsole::listen(){
         if(!active) activate();
-        print(this->ib_->get());
+        print(convert2UTF(this->ib_->get()));
     }
 
@@ -84 +84 @@
         newline();
         this->ib_->set(CommandExecutor::complete(this->ib_->get()));
-        print(this->ib_->get());
+        print(convert2UTF(this->ib_->get()));
     }
 
@@ -196 +196 @@
         cursor += dt;
         if(cursor >= 2*BLINK) cursor = 0;
-        print(this->ib_->get());
+        print(convert2UTF(this->ib_->get()));
 
 // this creates a flickering effect
@@ -244 +244 @@
     @param s string to be printed
     */
-    void InGameConsole::print(std::string s){
-        if(cursor>BLINK) consoleOverlayTextAreas[0]->setCaption(">" + convert2UTF(s));
-        else consoleOverlayTextAreas[0]->setCaption(">" + convert2UTF(s) + "_");
+    void InGameConsole::print(Ogre::UTFString s){
+        if(cursor>BLINK) consoleOverlayTextAreas[0]->setCaption(">" + s);
+        else consoleOverlayTextAreas[0]->setCaption(">" + s + "_");
     }
 
@@ -253 +253 @@
     */
     void InGameConsole::newline(){
-        std::string line;
+        Ogre::UTFString line;
         for(int i = LINES-1; i>=1; i--){
             line = consoleOverlayTextAreas[i-1]->getCaption();
@@ -259 +259 @@
             int l = line.length();
             if(!line.empty() && line.substr(l-1) == "_") line.erase(l-1);
-            consoleOverlayTextAreas[i]->setCaption(convert2UTF(line));
+            consoleOverlayTextAreas[i]->setCaption(line);
         }
         consoleOverlayTextAreas[0]->setCaption(">");

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

@@ -60 +60 @@
         private:
             void resize();
-            void print(std::string s);
+            void print(Ogre::UTFString s);
             void newline();
             Ogre::UTFString convert2UTF(std::string s);