Changeset 2004 for code/branches/objecthierarchy/src

Timestamp:

Oct 24, 2008, 12:58:49 AM (16 years ago)

Author:

rgrieder

Message:

fixed a warning in KeyBinder.cc and an error when converting a MultiType to std::string.

Location:

code/branches/objecthierarchy/src

Files:

• core/input/KeyBinder.cc (modified) (2 diffs)
• orxonox/gamestates/GSClient.cc (modified) (1 diff)

code/branches/objecthierarchy/src/core/input/KeyBinder.cc

@@ -359 +359 @@
         }
 
-        for (int i = 0; i < MouseAxisCode::numberOfAxes * 2; i++)
+        for (unsigned int i = 0; i < MouseAxisCode::numberOfAxes * 2; i++)
         {
             // Why dividing relative value by dt? The reason lies in the simple fact, that when you
@@ -378 +378 @@
     void KeyBinder::tickJoyStick(float dt, unsigned int joyStick)
     {
-        for (int i = 0; i < JoyStickAxisCode::numberOfAxes * 2; i++)
+        for (unsigned int i = 0; i < JoyStickAxisCode::numberOfAxes * 2; i++)
         {
             tickHalfAxis(joyStickAxes_[joyStick][i]);

code/branches/objecthierarchy/src/orxonox/gamestates/GSClient.cc

@@ -55 +55 @@
         GSLevel::enter();
 
-        this->client_ = new network::Client((std::string)CommandLine::getValue("ip"), CommandLine::getValue("port"));
+        this->client_ = new network::Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
 
         if(!client_->establishConnection())