yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-31 21:30:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Die Reste vom Joystick entfernt

Browse source
This commit is contained in:
Yamagi Burmeister 2010-07-13 18:04:07 +00:00
parent 185063f1a9
commit 6fd3a53119
4 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/cl_main.c
View file

@ -806,8 +806,6 @@ void CL_Init (void)
CL_InitLocal ();
IN_Init ();
FS_ExecAutoexec ();
Cbuf_Execute ();

1
src/client/input/header/input.h
View file

@ -25,7 +25,6 @@
* =======================================================================
*/
void IN_Init (void);
void IN_Shutdown (void);
/* oportunity for devices to stick commands on the script buffer */

24
src/client/menu/menu.c
View file

@ -953,8 +953,6 @@ static void M_Menu_Keys_f (void) {
* CONTROLS MENU
* =============
*/
extern cvar_t *in_joystick;
static menuframework_s s_options_menu;
static menuaction_s s_options_defaults_action;
static menuaction_s s_options_customize_options_action;
@ -966,7 +964,6 @@ static menulist_s s_options_lookspring_box;
static menulist_s s_options_lookstrafe_box;
static menulist_s s_options_crosshair_box;
static menuslider_s s_options_sfxvolume_slider;
static menulist_s s_options_joystick_box;
static menulist_s s_options_cdvolume_box;
static menulist_s s_options_cdshuffle_box;
static menulist_s s_options_oggvolume_box;
@ -978,10 +975,6 @@ static void CrosshairFunc( void *unused ) {
Cvar_SetValue( "crosshair", (float)s_options_crosshair_box.curvalue );
}
static void JoystickFunc( void *unused ) {
Cvar_SetValue( "in_joystick", s_options_joystick_box.curvalue );
}
static void CustomizeControlsFunc( void *unused ) {
M_Menu_Keys_f();
}
@ -1040,9 +1033,6 @@ static void ControlsSetMenuItemValues( void ) {
Cvar_SetValue( "crosshair", ClampCvar( 0, 3, crosshair->value ) );
s_options_crosshair_box.curvalue = crosshair->value;
Cvar_SetValue( "in_joystick", ClampCvar( 0, 1, in_joystick->value ) );
s_options_joystick_box.curvalue = in_joystick->value;
}
static void ControlsResetDefaultsFunc( void *unused ) {
@ -1318,28 +1308,21 @@ static void Options_MenuInit( void ) {
s_options_crosshair_box.generic.callback = CrosshairFunc;
s_options_crosshair_box.itemnames = crosshair_names;
s_options_joystick_box.generic.type = MTYPE_SPINCONTROL;
s_options_joystick_box.generic.x = 0;
s_options_joystick_box.generic.y = 140;
s_options_joystick_box.generic.name = "use joystick";
s_options_joystick_box.generic.callback = JoystickFunc;
s_options_joystick_box.itemnames = yesno_names;
s_options_customize_options_action.generic.type = MTYPE_ACTION;
s_options_customize_options_action.generic.x = 0;
s_options_customize_options_action.generic.y = 160;
s_options_customize_options_action.generic.y = 150;
s_options_customize_options_action.generic.name = "customize controls";
s_options_customize_options_action.generic.callback = CustomizeControlsFunc;
s_options_defaults_action.generic.type = MTYPE_ACTION;
s_options_defaults_action.generic.x = 0;
s_options_defaults_action.generic.y = 170;
s_options_defaults_action.generic.y = 160;
s_options_defaults_action.generic.name = "reset defaults";
s_options_defaults_action.generic.callback = ControlsResetDefaultsFunc;
s_options_console_action.generic.type = MTYPE_ACTION;
s_options_console_action.generic.x = 0;
s_options_console_action.generic.y = 180;
s_options_console_action.generic.y = 170;
s_options_console_action.generic.name = "go to console";
s_options_console_action.generic.callback = ConsoleFunc;
@ -1358,7 +1341,6 @@ static void Options_MenuInit( void ) {
Menu_AddItem( &s_options_menu, ( void * ) &s_options_lookstrafe_box );
Menu_AddItem( &s_options_menu, ( void * ) &s_options_freelook_box );
Menu_AddItem( &s_options_menu, ( void * ) &s_options_crosshair_box );
Menu_AddItem( &s_options_menu, ( void * ) &s_options_joystick_box );
Menu_AddItem( &s_options_menu, ( void * ) &s_options_customize_options_action );
Menu_AddItem( &s_options_menu, ( void * ) &s_options_defaults_action );
Menu_AddItem( &s_options_menu, ( void * ) &s_options_console_action );

12
src/posix/vid/refresh.c
View file

@ -67,7 +67,7 @@ void (*RW_IN_Commands_fp)(void);
void (*RW_IN_Move_fp)(usercmd_t *cmd);
void (*RW_IN_Frame_fp)(void);
void Real_IN_Init (void);
void IN_Init (void);
/** CLIPBOARD *************************************************************/
@ -311,7 +311,7 @@ qboolean VID_LoadRefresh( char *name )
/* this one is optional */
RW_Sys_GetClipboardData_fp = dlsym(reflib_library, "RW_Sys_GetClipboardData");
Real_IN_Init();
IN_Init();
if ( re.Init( 0, 0 ) == -1 )
{
@ -458,15 +458,7 @@ qboolean VID_CheckRefExists (const char *ref)
/* INPUT */
/*****************************************************************************/
cvar_t *in_joystick;
// This is fake, it's acutally done by the Refresh load
void IN_Init (void)
{
in_joystick = Cvar_Get ("in_joystick", "0", CVAR_ARCHIVE);
}
void Real_IN_Init (void)
{
if (RW_IN_Init_fp)
RW_IN_Init_fp(&in_state);