Changeset 1538 for code/trunk/src/orxonox/console

Timestamp:

Jun 4, 2008, 10:44:41 PM (17 years ago)

Author:

rgrieder

Message:

• fixed a bug in cursorChanged in InGameConsole
• prevented Ogre from displaying unnecessary exceptions when ogre.cfg is not present

Location:

code/trunk/src/orxonox/console

Files:

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

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

@@ -299 +299 @@
 
         this->linesChanged();
+        this->cursorChanged();
     }
 
@@ -372 +373 @@
         Shell::getInstance().registerListener(this);
         this->linesChanged();
+        this->cursorChanged();
 
         this->consoleOverlay_->show();
@@ -460 +462 @@
     }
 
-    void InGameConsole::setCursorPosition(int pos)
+    void InGameConsole::setCursorPosition(unsigned int pos)
     {
         static std::string char1 = "bdefgilpqtzCEGIJKNOPQT5[}äü";
@@ -471 +473 @@
 
         float width = 0;
-        for (int i = 0; i < pos; ++i)
+        for (unsigned int i = 0; i < pos && i < displayedText_.size(); ++i)
         {
             if (char1.find(displayedText_[i]) != std::string::npos)

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

@@ -72 +72 @@
             void shiftLines();
             void colourLine(int colourcode, int index);
-            void setCursorPosition(int pos);
+            void setCursorPosition(unsigned int pos);
             void print(const std::string& text, int index, bool alwaysShift = false);
             static Ogre::UTFString convert2UTF(std::string s);