qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-26 05:40:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small fix for duplicated Registering of _windowed_mouse

Browse source
This commit is contained in:
Dan Olson 2000-02-20 20:45:18 +00:00
parent 692f99de11
commit f6b334821b
4 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/gl_vidglx.c
View file

@ -412,7 +412,6 @@ void VID_Init(unsigned char *palette)
Cvar_RegisterVariable(&vid_mode); Cvar_RegisterVariable(&vid_mode);
Cvar_RegisterVariable(&gl_ztrick); Cvar_RegisterVariable(&gl_ztrick);
Cvar_RegisterVariable(&_windowed_mouse);
Cvar_RegisterVariable(&vid_glx_fullscreen); Cvar_RegisterVariable(&vid_glx_fullscreen);
vid.maxwarpwidth = WARP_WIDTH; vid.maxwarpwidth = WARP_WIDTH;

2
common/gl_vidnt.c
View file

@ -156,7 +156,6 @@ cvar_t _vid_wait_override = {"_vid_wait_override", "0", CVAR_ARCHIVE};
cvar_t vid_config_x = {"vid_config_x", "800", CVAR_ARCHIVE}; cvar_t vid_config_x = {"vid_config_x", "800", CVAR_ARCHIVE};
cvar_t vid_config_y = {"vid_config_y", "600", CVAR_ARCHIVE}; cvar_t vid_config_y = {"vid_config_y", "600", CVAR_ARCHIVE};
cvar_t vid_stretch_by_2 = {"vid_stretch_by_2", "1", CVAR_ARCHIVE}; cvar_t vid_stretch_by_2 = {"vid_stretch_by_2", "1", CVAR_ARCHIVE};
cvar_t _windowed_mouse = {"_windowed_mouse", "1", CVAR_ARCHIVE};
int window_center_x, window_center_y, window_x, window_y, window_width, window_height; int window_center_x, window_center_y, window_x, window_y, window_width, window_height;
RECT window_rect; RECT window_rect;
@ -1589,7 +1588,6 @@ void VID_Init (unsigned char *palette)
Cvar_RegisterVariable (&vid_config_x); Cvar_RegisterVariable (&vid_config_x);
Cvar_RegisterVariable (&vid_config_y); Cvar_RegisterVariable (&vid_config_y);
Cvar_RegisterVariable (&vid_stretch_by_2); Cvar_RegisterVariable (&vid_stretch_by_2);
Cvar_RegisterVariable (&_windowed_mouse);
Cvar_RegisterVariable (&gl_ztrick); Cvar_RegisterVariable (&gl_ztrick);
Cmd_AddCommand ("vid_nummodes", VID_NumModes_f); Cmd_AddCommand ("vid_nummodes", VID_NumModes_f);

2
common/vid_dos.c
View file

@ -53,7 +53,6 @@ cvar_t _vid_default_mode_win = {"_vid_default_mode_win","1", CVAR_ARCHIVE};
cvar_t vid_config_x = {"vid_config_x","800", CVAR_ARCHIVE}; cvar_t vid_config_x = {"vid_config_x","800", CVAR_ARCHIVE};
cvar_t vid_config_y = {"vid_config_y","600", CVAR_ARCHIVE}; cvar_t vid_config_y = {"vid_config_y","600", CVAR_ARCHIVE};
cvar_t vid_stretch_by_2 = {"vid_stretch_by_2","1", CVAR_ARCHIVE}; cvar_t vid_stretch_by_2 = {"vid_stretch_by_2","1", CVAR_ARCHIVE};
cvar_t _windowed_mouse = {"_windowed_mouse","0", CVAR_ARCHIVE};
cvar_t vid_fullscreen_mode = {"vid_fullscreen_mode","3", CVAR_ARCHIVE}; cvar_t vid_fullscreen_mode = {"vid_fullscreen_mode","3", CVAR_ARCHIVE};
cvar_t vid_windowed_mode = {"vid_windowed_mode","0", CVAR_ARCHIVE}; cvar_t vid_windowed_mode = {"vid_windowed_mode","0", CVAR_ARCHIVE};
cvar_t block_switch = {"block_switch","0", CVAR_ARCHIVE}; cvar_t block_switch = {"block_switch","0", CVAR_ARCHIVE};
@ -105,7 +104,6 @@ void VID_Init (unsigned char *palette)
Cvar_RegisterVariable (&vid_config_x); Cvar_RegisterVariable (&vid_config_x);
Cvar_RegisterVariable (&vid_config_y); Cvar_RegisterVariable (&vid_config_y);
Cvar_RegisterVariable (&vid_stretch_by_2); Cvar_RegisterVariable (&vid_stretch_by_2);
Cvar_RegisterVariable (&_windowed_mouse);
Cvar_RegisterVariable (&vid_fullscreen_mode); Cvar_RegisterVariable (&vid_fullscreen_mode);
Cvar_RegisterVariable (&vid_windowed_mode); Cvar_RegisterVariable (&vid_windowed_mode);
Cvar_RegisterVariable (&block_switch); Cvar_RegisterVariable (&block_switch);

2
common/vid_sdl.c
View file

@ -33,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <cmd.h> #include <cmd.h>
#include <client.h> #include <client.h>
cvar_t _windowed_mouse = {"_windowed_mouse","0", CVAR_ARCHIVE};
static float old_windowed_mouse = 0; static float old_windowed_mouse = 0;
viddef_t vid; // global video state viddef_t vid; // global video state
@ -91,7 +90,6 @@ void VID_Init (unsigned char *palette)
S_Init(); S_Init();
Cvar_RegisterVariable(&_windowed_mouse);
// Load the SDL library // Load the SDL library
if (SDL_Init(SDL_INIT_VIDEO|SDL_INIT_CDROM)<0) //|SDL_INIT_AUDIO|SDL_INIT_CDROM) < 0) if (SDL_Init(SDL_INIT_VIDEO|SDL_INIT_CDROM)<0) //|SDL_INIT_AUDIO|SDL_INIT_CDROM) < 0)
Sys_Error("VID: Couldn't load SDL: %s", SDL_GetError()); Sys_Error("VID: Couldn't load SDL: %s", SDL_GetError());