trying to fix elusive build errors or Arthur's and Minibjorns' computers

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3313 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/input/input_manager.cpp

@@ -404,11 +404,7 @@ void InputManager::input(Input::InputType type, int id0, int id1, int id2,
 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 @@ void InputManager::input()
                 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 @@ void InputManager::input()
                     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

src/material.cpp

@@ -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