Changeset 1538 for code/trunk

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

Files:

• core/input/KeyBinder.cc (modified) (1 diff)
• orxonox/GraphicsEngine.cc (modified) (2 diffs)
• orxonox/console/InGameConsole.cc (modified) (4 diffs)
• orxonox/console/InGameConsole.h (modified) (1 diff)

code/trunk/src/core/input/KeyBinder.cc

@@ -214 +214 @@
     std::ifstream infile;
     infile.open("keybindings.ini");
-    if (!infile.is_open())
+    if (!infile)
     {
       ConfigFileManager::getSingleton()->setFile(CFT_Keybindings, "def_keybindings.ini");
       ConfigFileManager::getSingleton()->save(CFT_Keybindings, "keybindings.ini");
     }
-    infile.close();
+    else
+      infile.close();
     ConfigFileManager::getSingleton()->setFile(CFT_Keybindings, "keybindings.ini");
 

code/trunk/src/orxonox/GraphicsEngine.cc

@@ -34 +34 @@
 #include "OrxonoxStableHeaders.h"
 #include "GraphicsEngine.h"
+
+#include <fstream>
 
 #include <OgreConfigFile.h>
@@ -260 +262 @@
   {
     CCOUT(4) << "Configuring Renderer" << std::endl;
-    if (!root_->restoreConfig() && !root_->showConfigDialog())
-      return false;
+
+    // check for file existence because Ogre displays exceptions if not
+    std::ifstream probe;
+    probe.open(ogreConfigFile_.c_str());
+    if (!probe)
+    {
+      // create a zero sized file
+      std::ofstream creator;
+      creator.open(ogreConfigFile_.c_str());
+      creator.close();
+    }
+    else
+      probe.close();
+
+    if (!root_->restoreConfig())
+      if (!root_->showConfigDialog())
+        return false;
 
     CCOUT(4) << "Creating render window" << std::endl;

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);