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

Benenne _windowed_mouse und windowed_mouse um

Browse source
This commit is contained in:
Yamagi Burmeister 2010-01-08 15:47:16 +00:00
parent 62a82f103d
commit 315f07cae7
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/cl_scrn.c
View file

@ -502,7 +502,7 @@ void SCR_RunConsole (void)
if (scr_conlines < scr_con_current)
{
Cvar_SetValue("_windowed_mouse", 1);
Cvar_SetValue("windowed_mouse", 1);
scr_con_current -= scr_conspeed->value*cls.frametime;
if (scr_conlines > scr_con_current)
scr_con_current = scr_conlines;
@ -510,7 +510,7 @@ void SCR_RunConsole (void)
}
else if (scr_conlines > scr_con_current)
{
Cvar_SetValue("_windowed_mouse", 0);
Cvar_SetValue("windowed_mouse", 0);
scr_con_current += scr_conspeed->value*cls.frametime;
if (scr_conlines < scr_con_current)
scr_con_current = scr_conlines;

4
src/client/console/console.c
View file

@ -71,14 +71,14 @@ void Con_ToggleConsole_f (void)
if (cl.attractloop)
{
Cvar_SetValue("_windowed_mouse", 0);
Cvar_SetValue("windowed_mouse", 0);
Cbuf_AddText("killserver\n");
return;
}
if (cls.state == ca_disconnected)
{ // start the demo loop again
Cvar_SetValue("_windowed_mouse", 1);
Cvar_SetValue("windowed_mouse", 1);
Cbuf_AddText ("d1\n");
return;
}

8
src/posix/vid/menu.c
View file

@ -51,7 +51,7 @@ static cvar_t *gl_ext_palettedtexture;
static cvar_t *sw_mode;
static cvar_t *sw_stipplealpha;
static cvar_t *_windowed_mouse;
static cvar_t *windowed_mouse;
extern void M_ForceMenuOff( void );
extern qboolean VID_CheckRefExists( const char *name );
@ -269,8 +269,8 @@ void VID_MenuInit( void )
if ( !sw_stipplealpha )
sw_stipplealpha = Cvar_Get( "sw_stipplealpha", "0", CVAR_ARCHIVE );
if ( !_windowed_mouse)
_windowed_mouse = Cvar_Get( "_windowed_mouse", "1", CVAR_ARCHIVE );
if ( !windowed_mouse)
windowed_mouse = Cvar_Get( "windowed_mouse", "1", CVAR_ARCHIVE );
/* custom mode */
if (gl_mode->value >= 1.0)
@ -362,7 +362,7 @@ void VID_MenuInit( void )
s_windowed_mouse.generic.x = 0;
s_windowed_mouse.generic.y = 72;
s_windowed_mouse.generic.name = "windowed mouse";
s_windowed_mouse.curvalue = _windowed_mouse->value;
s_windowed_mouse.curvalue = windowed_mouse->value;
s_windowed_mouse.itemnames = yesno_names;
s_tq_slider.generic.type = MTYPE_SLIDER;

12
src/sdl/refresh.c
View file

@ -66,10 +66,10 @@ qboolean mouse_active;
int mx, my, mouse_buttonstate;
static float old_windowed_mouse;
static cvar_t *_windowed_mouse;
static cvar_t *windowed_mouse;
void RW_IN_PlatformInit() {
_windowed_mouse = ri.Cvar_Get ("_windowed_mouse", "1", CVAR_ARCHIVE);
windowed_mouse = ri.Cvar_Get ("windowed_mouse", "1", CVAR_ARCHIVE);
}
void RW_IN_Activate(qboolean active)
@ -227,7 +227,7 @@ void GetEvent(SDL_Event *event)
if ( (KeyStates[SDLK_LCTRL] || KeyStates[SDLK_RCTRL]) &&
(event->key.keysym.sym == SDLK_g) ) {
SDL_GrabMode gm = SDL_WM_GrabInput(SDL_GRAB_QUERY);
ri.Cvar_SetValue( "_windowed_mouse", (gm == SDL_GRAB_ON) ? 1 : 0 );
ri.Cvar_SetValue( "windowed_mouse", (gm == SDL_GRAB_ON) ? 1 : 0 );
break;
}
@ -526,10 +526,10 @@ void KBD_Update(void)
mouse_buttonstate |= (1 << 4);
if (old_windowed_mouse != _windowed_mouse->value) {
old_windowed_mouse = _windowed_mouse->value;
if (old_windowed_mouse != windowed_mouse->value) {
old_windowed_mouse = windowed_mouse->value;
if (!_windowed_mouse->value) {
if (!windowed_mouse->value) {
SDL_WM_GrabInput(SDL_GRAB_OFF);
} else {
SDL_WM_GrabInput(SDL_GRAB_ON);

2
src/server/sv_init.c
View file

@ -278,7 +278,7 @@ void SV_SpawnServer (char *server, char *spawnpoint, server_state_t serverstate,
// set serverinfo variable
Cvar_FullSet ("mapname", sv.name, CVAR_SERVERINFO | CVAR_NOSET);
Cvar_SetValue("_windowed_mouse", 1);
Cvar_SetValue("windowed_mouse", 1);
Com_Printf ("-------------------------------------\n");
}