- IN_Startup();\r
- //IN_Default(0,&gvar.player,ctrl_Joystick1);\r
- //IN_SetControlType(0,&gvar.player,ctrl_Joystick1);\r
- IN_Default(0,&gvar.player,ctrl_Keyboard1);\r
- IN_SetControlType(0,&gvar.player,ctrl_Keyboard1);\r
+ IN_Startup(&gvar);\r
+ IN_Default(0,&gvar.player[0],\r
+ #if !defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)\r
+ ctrl_Keyboard1\r
+ #endif\r
+ #if defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)\r
+ ctrl_Joystick1\r
+ #endif\r
+ #if !defined(INPUTEST_JOYSTICKPADTEST) && defined(INPUTEST_MOUSETEST)\r
+ ctrl_Mouse\r
+ #endif\r
+ , &gvar);\r
+ IN_SetControlType(&gvar.player[0],\r
+ #if !defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)\r
+ ctrl_Keyboard1\r
+ #endif\r
+ #if defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)\r
+ ctrl_Joystick1\r
+ #endif\r
+ #if !defined(INPUTEST_JOYSTICKPADTEST) && defined(INPUTEST_MOUSETEST)\r
+ ctrl_Mouse\r
+ #endif\r
+ );\r