Changeset 2543 for code/branches/presentation/src/core/input/KeyBinder.h

Timestamp:

Dec 28, 2008, 11:56:31 PM (15 years ago)

Author:

rgrieder

Message:

• Fixed a bug in ConfigFileManager::getVectorSize(). If there were no entries, 1 was returned instead of 0.
• Added getSctionName to the ConfigValueContainer
• Bugfix in Button::clear()
• Renamed some joy stick buttons and axes to have them sorted corrected in the config file
• Removed annoying and useless "Key_084=" from keybindings.ini file (there were about a hundred of them)
• Bugfix in KeyBinder: All the axes were inverted (which was then corrected in the ini file)
• Also inverted rotateYaw in SpaceShip and Spectator because that actually corrected the bug from above
• Some small performance optimisation in InputManager

File:

• code/branches/presentation/src/core/input/KeyBinder.h (modified) (3 diffs)

code/branches/presentation/src/core/input/KeyBinder.h

@@ -39 +39 @@
 
 #include <vector>
+#include <cassert>
+
 #include "InputInterfaces.h"
 #include "Button.h"
@@ -44 +46 @@
 #include "InputCommands.h"
 #include "JoyStickDeviceNumberListener.h"
-#include "core/ConfigFileManager.h"
 
 namespace orxonox
@@ -171 +172 @@
 
     inline void KeyBinder::keyPressed (const KeyEvent& evt)
-    { keys_[evt.key].execute(KeybindMode::OnPress); }
+    { assert(!keys_[evt.key].name_.empty()); keys_[evt.key].execute(KeybindMode::OnPress); }
 
     inline void KeyBinder::keyReleased(const KeyEvent& evt)
-    { keys_[evt.key].execute(KeybindMode::OnRelease); }
+    { assert(!keys_[evt.key].name_.empty()); keys_[evt.key].execute(KeybindMode::OnRelease); }
 
     inline void KeyBinder::keyHeld    (const KeyEvent& evt)
-    { keys_[evt.key].execute(KeybindMode::OnHold); }
+    { assert(!keys_[evt.key].name_.empty()); keys_[evt.key].execute(KeybindMode::OnHold); }