Changeset 1420 for code/branches

Timestamp:

May 25, 2008, 2:19:39 PM (16 years ago)

Author:

rgrieder

Message:

• fixed 2 bugs

Location:

code/branches/network/src/core

Files:

• KeyBinder.cc (modified) (3 diffs)
• KeyBinder.h (modified) (1 diff)

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

@@ -474 +474 @@
     if (!infile.is_open())
     {
-      ConfigFileManager::getSingleton()->setFile(CFT_Keybindings, keybindingsDefault_);
+      ConfigFileManager::getSingleton()->setFile(CFT_Keybindings, "def_keybindings.ini");
       ConfigFileManager::getSingleton()->save(CFT_Keybindings, "keybindings.ini");
     }
@@ -496 +496 @@
     SetConfigValue(derivePeriod_, 0.1f).description("Accuracy of the mouse input deriver. The higher the more precise, but laggier.");
     SetConfigValue(mouseSensitivityDerived_, 1.0f).description("Mouse sensitivity if mouse input is derived.");
-    SetConfigValue(keybindingsDefault_, "def_keybindings.ini").description("Default ini file for the keybindings.");
 
     float oldThresh = buttonThreshold_;
@@ -586 +585 @@
             halfAxes_[i].execute(KeybindMode::OnRelease);
         }
-        if (halfAxes_[i].wasDown_)
-        {
-          if (halfAxes_[i].nCommands_[KeybindMode::OnHold])
-            halfAxes_[i].execute(KeybindMode::OnHold);
-        }
         halfAxes_[i].hasChanged_ = false;
+      }
+
+      if (halfAxes_[i].wasDown_)
+      {
+        if (halfAxes_[i].nCommands_[KeybindMode::OnHold])
+          halfAxes_[i].execute(KeybindMode::OnHold);
       }
 

code/branches/network/src/core/KeyBinder.h

@@ -222 +222 @@
     //! mouse sensitivity if mouse input is derived
     float mouseSensitivityDerived_;
-    //! default ini file for the keybindings
-    std::string keybindingsDefault_;
   };