ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed sticky joysticks... again.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3828 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
rforder 2009-08-09 19:04:06 +00:00
parent abfda2b933
commit 2a23fa33a8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/input/device_manager.cpp
View File

@ -193,7 +193,7 @@ InputDevice *DeviceManager::mapGamepadInput( Input::InputType type,
if (gPad != NULL) if (gPad != NULL)
{ {
if (gPad->hasBinding(type, btnID, value, NULL, action)) if (gPad->hasBinding(type, btnID, value, gPad->getPlayer(), action))
{ {
if (m_assign_mode == NO_ASSIGN) // Don't set the player in NO_ASSIGN mode if (m_assign_mode == NO_ASSIGN) // Don't set the player in NO_ASSIGN mode
{ {

1
src/input/input_device.hpp
View File

@ -34,6 +34,7 @@ public:
DeviceType getType() const { return m_type; }; DeviceType getType() const { return m_type; };
void setPlayer(ActivePlayer* owner); void setPlayer(ActivePlayer* owner);
ActivePlayer *getPlayer() {return m_player;}
/** /**
* returns a human-readable string for the key binded with the given action * returns a human-readable string for the key binded with the given action