update repo

diff --git a/src/inputest.c b/src/inputest.c
index a27c2dd5ab5182508eab1ae504e3daa2a4b0394d..7f3b82879802d803919bf330f24f15c363fe79e1 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -45,7 +45,7 @@ main(int argc, char *argv[])
                                                                ctrl_Keyboard1\r
                                #endif\r
                                #if defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)\r
-                                                               ctrl_Joystick1\r
+                                                               ctrl_Joystick2\r
                                #endif\r
                                #if !defined(INPUTEST_JOYSTICKPADTEST) && defined(INPUTEST_MOUSETEST)\r
                                                                ctrl_Mouse\r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index bc91ce3026a176b0734a48960e373c9e01a66d18..834e3b3737f1d1a336aaaf879b925de8d1514529 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -377,9 +377,9 @@ done:
 void INL_GetJoyDelta(word joy,int *dx,int *dy/*,boolean adaptive*/, global_game_variables_t *gvar)\r
 {\r
        word            x,y;\r
-//00   word TimeCount = *clockw;\r
+//00++++       word TimeCount = *clockw;\r
        JoystickDef     *def;\r
-//00static     word    lasttime;\r
+//00++++static word    lasttime;\r
 \r
        IN_GetJoyAbs(joy,&x,&y);\r
        def = gvar->in.JoyDefs + joy;\r
@@ -440,7 +440,7 @@ void INL_GetJoyDelta(word joy,int *dx,int *dy/*,boolean adaptive*/, global_game_
 //                     *dy *= time;\r
 //             }\r
 //     }\r
-//00   lasttime = TimeCount;\r
+//00++++       lasttime = TimeCount;\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r
@@ -470,15 +470,15 @@ register  word    result;
 word\r
 IN_GetJoyButtonsDB(word joy)\r
 {\r
-//00   word TimeCount = *clockw;\r
-//00   word    lasttime;\r
+//00++++       word TimeCount = *clockw;\r
+//00++++       word    lasttime;\r
        word            result1,result2;\r
 \r
        do\r
        {\r
                result1 = INL_GetJoyButtons(joy);\r
-//00           lasttime = TimeCount;\r
-//00           while(TimeCount == lasttime)\r
+//00++++               lasttime = TimeCount;\r
+//00++++               while(TimeCount == lasttime)\r
                        //;\r
                result2 = INL_GetJoyButtons(joy);\r
        } while(result1 != result2);\r