Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok

Conflicts: src/GameWorld.cpp vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-13 03:36:09 +02:00
parent ce5b62cf6d d259811795
commit ab58cbc08d
16 changed files with 552 additions and 163 deletions
@@ -58,6 +58,8 @@ private:

 	void BindKey(int keyCode, std::string command, float value);
 	void BindMouseButton(int button, std::string command);
+	void BindGamepadAxis(Gamepad::Axis axis, std::string command, float value);
+	void BindGamepadButton(Gamepad::Button button, std::string command, float value);
 };

 #endif // GameWorld_h__