[Supertuxkart-commit] SF.net SVN: supertuxkart:[12216] main/branches/0.8

[<au...@us...>]

Revision: 12216
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=12216&view=rev
Author:   auria
Date:     2012-12-08 22:35:45 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
Fix memory overflow

Modified Paths:
--------------
    main/branches/0.8/data/tracks/scotland/gnu_bar.png
    main/branches/0.8/src/input/input_device.cpp

Modified: main/branches/0.8/data/tracks/scotland/gnu_bar.png
===================================================================
(Binary files differ)

Modified: main/branches/0.8/src/input/input_device.cpp
===================================================================
--- main/branches/0.8/src/input/input_device.cpp	2012-12-08 22:35:27 UTC (rev 12215)
+++ main/branches/0.8/src/input/input_device.cpp	2012-12-08 22:35:45 UTC (rev 12216)
@@ -173,10 +173,9 @@
     
     if (type == Input::IT_STICKMOTION)
     {
-        if (id >= m_axis_count && id != Input::HAT_H_ID && 
-            id != Input::HAT_V_ID) 
-            return false; // this gamepad doesn't even have that many axes
-
+        // this gamepad doesn't even have that many axes
+        if (id >= m_axis_count) return false;
+        
         if (player != NULL)
         {
             // going to negative from positive
@@ -193,7 +192,7 @@
                 resetAxisDirection(id, Input::AD_NEGATIVE, player);
             }
         }
-
+        
         if     (value > 0) m_prevAxisDirections[id] = Input::AD_POSITIVE;
         else if(value < 0) m_prevAxisDirections[id] = Input::AD_NEGATIVE;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.