Changeset 1169

Timestamp:

Apr 24, 2008, 2:49:54 PM (16 years ago)

Author:

FelixSchulthess

Message:

cönsöle häs spêcíäl chärs. please update media also…

Location:

code/branches/console/src/orxonox/console

Files:

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

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

@@ -109 +109 @@
         scrollTimer = 0;
         cursor = 0;
+
         // create overlay and elements
         om = &Ogre::OverlayManager::getSingleton();
@@ -244 +245 @@
     */
     void InGameConsole::print(std::string s){
-        if(cursor>BLINK) consoleOverlayTextAreas[0]->setCaption(">" + s);
-        else consoleOverlayTextAreas[0]->setCaption(">" + s + "_");
+        if(cursor>BLINK) consoleOverlayTextAreas[0]->setCaption(">" + convert2UTF(s));
+        else consoleOverlayTextAreas[0]->setCaption(">" + convert2UTF(s) + "_");
     }
 
@@ -252 +253 @@
     */
     void InGameConsole::newline(){
-
         std::string line;
         for(int i = LINES-1; i>=1; i--){
@@ -259 +259 @@
             int l = line.length();
             if(!line.empty() && line.substr(l-1) == "_") line.erase(l-1);
-            consoleOverlayTextAreas[i]->setCaption(line);
+            consoleOverlayTextAreas[i]->setCaption(convert2UTF(line));
         }
         consoleOverlayTextAreas[0]->setCaption(">");
     }
+
+    Ogre::UTFString InGameConsole::convert2UTF(std::string s){
+        Ogre::UTFString utf;
+        int i;
+        Ogre::UTFString::code_point cp;
+        for (i=0; i<(int)s.size(); ++i){
+          cp = s[i];
+          cp &= 0xFF;
+          utf.append(1, cp);
+        }
+        return utf;
+    }
 }

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

@@ -62 +62 @@
             void print(std::string s);
             void newline();
+            Ogre::UTFString convert2UTF(std::string s);
 
             int windowW;