Changeset 1455

Timestamp:

May 28, 2008, 7:06:19 PM (16 years ago)

Author:

rgrieder

Message:

• 'fixed' a bug in CppTcl.cc, but why would map::find pose a problem if the map is empty?
• 'fixed' InGameConsole destructor: commented everything. We should probably use OverlayManager::destroyOverlay to delete the created overlay elements. Unfortunately that didn't work either. And I changed delete to delete[] for the list.

Location:

code/branches/network/src

Files:

• core/InputManager.cc (modified) (3 diffs)
• cpptcl/CppTcl.cc (modified) (1 diff)
• orxonox/console/InGameConsole.cc (modified) (1 diff)

code/branches/network/src/core/InputManager.cc

@@ -662 +662 @@
       ConfigValueContainer* cont = getIdentifier()->getConfigValueContainer("CoeffPos");
       assert(cont);
-      cont->set(getConvertedValue<int, std::string>(i) + " "
-        + getConvertedValue<float, std::string>(joySticksCalibration_[0].positiveCoeff[i]));
+      cont->set(i, joySticksCalibration_[0].positiveCoeff[i]);
 
       // negative coefficient
@@ -676 +675 @@
       cont = getIdentifier()->getConfigValueContainer("CoeffNeg");
       assert(cont);
-      cont->set(getConvertedValue<int, std::string>(i) + " "
-        + getConvertedValue<float, std::string>(joySticksCalibration_[0].negativeCoeff[i]));
+      cont->set(i, joySticksCalibration_[0].negativeCoeff[i]);
 
       // zero states
@@ -697 +695 @@
       cont = getIdentifier()->getConfigValueContainer("Zero");
       assert(cont);
-      cont->set(getConvertedValue<int, std::string>(i) + " "
-        + getConvertedValue<int, std::string>(joySticksCalibration_[0].zeroStates[i]));
+      cont->set(i, joySticksCalibration_[0].zeroStates[i]);
     }
   }

code/branches/network/src/cpptcl/CppTcl.cc

@@ -953 +953 @@
 
      {
+          if (callbacks.size() == 0)
+            return;
           callback_map::iterator it = callbacks.find(interp);
           if (it == callbacks.end())

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

@@ -86 +86 @@
     InGameConsole::~InGameConsole(void)
     {
-        for (int i = 0; i < LINES; i++)
+        /*for (int i = 0; i < LINES; i++)
             if (this->consoleOverlayTextAreas_[i])
-                delete this->consoleOverlayTextAreas_[i];
+                om_->destroyOverlayElement(this->consoleOverlayTextAreas_[i]);
 
         if (this->consoleOverlayTextAreas_)
-            delete this->consoleOverlayTextAreas_;
+            delete[] this->consoleOverlayTextAreas_;*/
     }