From: <au...@us...> - 2009-03-29 22:12:51
|
Revision: 3313 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3313&view=rev Author: auria Date: 2009-03-29 22:12:44 +0000 (Sun, 29 Mar 2009) Log Message: ----------- trying to fix elusive build errors or Arthur's and Minibjorns' computers Modified Paths: -------------- main/branches/irrlicht/src/input/input_manager.cpp main/branches/irrlicht/src/material.cpp Modified: main/branches/irrlicht/src/input/input_manager.cpp =================================================================== --- main/branches/irrlicht/src/input/input_manager.cpp 2009-03-29 18:43:39 UTC (rev 3312) +++ main/branches/irrlicht/src/input/input_manager.cpp 2009-03-29 22:12:44 UTC (rev 3313) @@ -404,11 +404,7 @@ void InputManager::input() { SDL_Event ev; - /* Logical joystick index that is reported to the higher game APIs which - * may not be equal to SDL's joystick index. - */ - int stickIndex; - + while(SDL_PollEvent(&ev)) { switch(ev.type) @@ -496,8 +492,8 @@ break; case SDL_JOYAXISMOTION: - //const unsigned int value = ev.jaxis.value - 32768; - const int value = ev.jaxis.value;// - 32768*2; + { + const int value = ev.jaxis.value; //if(user_config->m_gamepad_debug) { @@ -585,6 +581,7 @@ m_stick_infos[ev.jaxis.which]->m_prevAxisDirections[ev.jaxis.axis] = Input::AD_NEUTRAL; } #endif + } break; case SDL_JOYBUTTONUP: /* TODO - bring gamepad back in, with new InputDevice interface Modified: main/branches/irrlicht/src/material.cpp =================================================================== --- main/branches/irrlicht/src/material.cpp 2009-03-29 18:43:39 UTC (rev 3312) +++ main/branches/irrlicht/src/material.cpp 2009-03-29 22:12:44 UTC (rev 3313) @@ -17,6 +17,9 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#include "io/xml_node.hpp" +#include "io/xml_reader.hpp" + #include "material.hpp" #include <stdexcept> @@ -24,9 +27,9 @@ #include "stk_config.hpp" #include "graphics/irr_driver.hpp" #include "io/file_manager.hpp" -#include "io/xml_node.hpp" #include "utils/string_utils.hpp" + #define UCLAMP 1 #define VCLAMP 2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |