From: <au...@us...> - 2009-03-31 15:14:34
|
Revision: 3327 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3327&view=rev Author: auria Date: 2009-03-31 15:14:23 +0000 (Tue, 31 Mar 2009) Log Message: ----------- made input config file valid XML by adding a global container tag Modified Paths: -------------- main/branches/irrlicht/src/input/device_manager.cpp Modified: main/branches/irrlicht/src/input/device_manager.cpp =================================================================== --- main/branches/irrlicht/src/input/device_manager.cpp 2009-03-31 04:59:02 UTC (rev 3326) +++ main/branches/irrlicht/src/input/device_manager.cpp 2009-03-31 15:14:23 UTC (rev 3327) @@ -183,6 +183,8 @@ } + configfile << "<input>\n\n"; + for(unsigned int n=0; n<m_keyboard_amount; n++) { m_keyboards[n].serialize(configfile); @@ -192,5 +194,7 @@ m_gamepads[n].serialize(configfile); } + configfile << "</input>\n"; + configfile.close(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2009-04-26 00:47:36
|
Revision: 3437 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3437&view=rev Author: auria Date: 2009-04-26 00:47:34 +0000 (Sun, 26 Apr 2009) Log Message: ----------- removed debug prints now that the bug is fixed Modified Paths: -------------- main/branches/irrlicht/src/input/device_manager.cpp Modified: main/branches/irrlicht/src/input/device_manager.cpp =================================================================== --- main/branches/irrlicht/src/input/device_manager.cpp 2009-04-26 00:43:31 UTC (rev 3436) +++ main/branches/irrlicht/src/input/device_manager.cpp 2009-04-26 00:47:34 UTC (rev 3437) @@ -102,11 +102,11 @@ // std::cout << "stick motion, ID=" <<id0 << " axis=" << id1 << " value=" << value << std::endl; for(unsigned int n=0; n<m_gamepad_amount; n++) { - std::cout << "checking gamepad #" << n << " out of " << m_gamepad_amount << std::endl; + //std::cout << "checking gamepad #" << n << " out of " << m_gamepad_amount << std::endl; if(m_gamepads[n].hasBinding(type, id1 /* axis or button */, value, *player, action /* out */) ) { - std::cout << "that's the one.\n"; + //std::cout << "that's the one.\n"; return true; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2009-07-11 19:29:34
|
Revision: 3734 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3734&view=rev Author: auria Date: 2009-07-11 19:29:33 +0000 (Sat, 11 Jul 2009) Log Message: ----------- Fixed in bug in the device manager that could cause crashes Modified Paths: -------------- main/branches/irrlicht/src/input/device_manager.cpp Modified: main/branches/irrlicht/src/input/device_manager.cpp =================================================================== --- main/branches/irrlicht/src/input/device_manager.cpp 2009-07-11 19:24:42 UTC (rev 3733) +++ main/branches/irrlicht/src/input/device_manager.cpp 2009-07-11 19:29:33 UTC (rev 3734) @@ -146,9 +146,9 @@ // stored inside the device so we don't need to iterate through players const ptr_vector<ActivePlayer, HOLD>& players = StateManager::getActivePlayers(); const int playerAmount = players.size(); - for(int n=0; n<playerAmount; n++) + for(int p=0; p<playerAmount; p++) { - if(players[n].getDevice() == m_keyboards.get(n)) + if(players[p].getDevice() == m_keyboards.get(n)) { // we found which active player has this binding *player = n; @@ -162,7 +162,7 @@ return true; } - } + } // end for player // no active player has this binding. if we want to check for new players trying to join, // check now This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2009-12-06 16:23:25
|
Revision: 4254 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=4254&view=rev Author: auria Date: 2009-12-06 16:23:17 +0000 (Sun, 06 Dec 2009) Log Message: ----------- Fixed input device association bug when starting game clicking and a gamepad is plugged Modified Paths: -------------- main/branches/irrlicht/src/input/device_manager.cpp Modified: main/branches/irrlicht/src/input/device_manager.cpp =================================================================== --- main/branches/irrlicht/src/input/device_manager.cpp 2009-12-06 16:06:39 UTC (rev 4253) +++ main/branches/irrlicht/src/input/device_manager.cpp 2009-12-06 16:23:17 UTC (rev 4254) @@ -246,7 +246,13 @@ }; // Return true if input was successfully translated to an action and player - if (device != NULL) m_latest_used_device = device; + if (device != NULL && abs(value) > Input::MAX_VALUE/2) + { + //std::cout<< "========== Setting latest device " << (device->getType() == DT_KEYBOARD ? "keyboard" : "gamepad") + // << " #" << deviceID << " button=" << btnID << " value=" << value << " ==========\n"; + + m_latest_used_device = device; + } return (device != NULL); } //----------------------------------------------------------------------------- @@ -254,8 +260,9 @@ { // If none, probably the user clicked or used enter; give keyboard by default - if (m_latest_used_device == NULL ) - { + if (m_latest_used_device == NULL) + { + std::cout<< "========== No latest device, returning keyboard ==========\n"; return m_keyboards.get(0); // FIXME: is this right? } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |