Changeset 1052 for code/trunk/src/orxonox/core/InputHandler.cc

Timestamp:

Apr 14, 2008, 3:42:49 AM (16 years ago)

Author:

landauf

Message:

merged core2 back to trunk
there might be some errors, wasn't able to test it yet due to some strange g++ and linker behaviour.

File:

• code/trunk/src/orxonox/core/InputHandler.cc (modified) (1 diff)

code/trunk/src/orxonox/core/InputHandler.cc

@@ -66 +66 @@
     {
       // simply write the key number (i) in the string
-      this->bindingsKeyPressed_[i] = ConvertValueAndReturn<int, std::string>(i);
-      this->bindingsKeyReleased_[i] = ConvertValueAndReturn<int, std::string>(i);
+      this->bindingsKeyPressed_[i] = getConvertedValue<int, std::string>(i);
+      this->bindingsKeyReleased_[i] = getConvertedValue<int, std::string>(i);
     }
     return true;