qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-10 14:52:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add #include "draw.h";

Browse source 
CVAR_FIXME cleanup.
This commit is contained in:
Anton E. Gavrilov 2000-05-22 01:05:57 +00:00
parent a7c238d27c
commit bc37d46f5b
1 changed files with 7 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
source/vid_wgl.c
View file

@ -42,6 +42,7 @@
#include "qargs.h"
#include "cmd.h"
#include "qendian.h"
#include "draw.h"
#define MAX_MODE_LIST 30
#define VID_ROW_SIZE 3
@ -121,8 +122,6 @@ HDC maindc;
glvert_t glv;
/* cvar_t gl_ztrick = {"gl_ztrick","1"};
CVAR_FIXME */
cvar_t *gl_ztrick;
HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow);
@ -160,37 +159,15 @@ qboolean gl_mtexable = false;
//====================================
/* cvar_t vid_mode = {"vid_mode","0", false};
CVAR_FIXME */
cvar_t *vid_mode;
// Note that 0 is MODE_WINDOWED
/* cvar_t _vid_default_mode = {"_vid_default_mode","0", true};
CVAR_FIXME */
cvar_t *_vid_default_mode;
// Note that 3 is MODE_FULLSCREEN_DEFAULT
/* cvar_t _vid_default_mode_win = {"_vid_default_mode_win","3", true};
CVAR_FIXME */
cvar_t *_vid_default_mode_win;
/* cvar_t vid_wait = {"vid_wait","0"};
CVAR_FIXME */
cvar_t *vid_wait;
/* cvar_t vid_nopageflip = {"vid_nopageflip","0", true};
CVAR_FIXME */
cvar_t *vid_nopageflip;
/* cvar_t _vid_wait_override = {"_vid_wait_override", "0", true};
CVAR_FIXME */
cvar_t *_vid_wait_override;
/* cvar_t vid_config_x = {"vid_config_x","800", true};
CVAR_FIXME */
cvar_t *vid_config_x;
/* cvar_t vid_config_y = {"vid_config_y","600", true};
CVAR_FIXME */
cvar_t *vid_config_y;
/* cvar_t vid_stretch_by_2 = {"vid_stretch_by_2","1", true};
CVAR_FIXME */
cvar_t *vid_stretch_by_2;
/* cvar_t _windowed_mouse = {"_windowed_mouse","1", true};
CVAR_FIXME */
cvar_t *_windowed_mouse;
int window_center_x, window_center_y, window_x, window_y, window_width, window_height;
@ -449,8 +426,6 @@ int VID_SetMode (int modenum, unsigned char *palette)
// Set either the fullscreen or windowed mode
if (modelist[modenum].type == MS_WINDOWED)
{
/* if (_windowed_mouse.value && key_dest == key_game)
CVAR_FIXME */
if (_windowed_mouse->value && key_dest == key_game)
{
stat = VID_SetWindowedMode(modenum);
@ -711,8 +686,6 @@ GL_BeginRendering
*/
void GL_BeginRendering (int *x, int *y, int *width, int *height)
{
/* extern cvar_t gl_clear;
CVAR_FIXME */
extern cvar_t *gl_clear;
*x = *y = 0;
@ -734,8 +707,6 @@ void GL_EndRendering (void)
// handle the mouse state when windowed if that's changed
if (modestate == MS_WINDOWED)
{
/* if (!_windowed_mouse.value) {
CVAR_FIXME */
if (!_windowed_mouse->value) {
if (windowed_mouse) {
IN_DeactivateMouse ();
@ -1045,8 +1016,6 @@ void AppActivate(BOOL fActive, BOOL minimize)
ShowWindow(mainwindow, SW_SHOWNORMAL);
}
}
/* else if ((modestate == MS_WINDOWED) && _windowed_mouse.value && key_dest == key_game)
CVAR_FIXME */
else if ((modestate == MS_WINDOWED) && _windowed_mouse->value && key_dest == key_game)
{
IN_ActivateMouse ();
@ -1065,8 +1034,6 @@ void AppActivate(BOOL fActive, BOOL minimize)
vid_wassuspended = true;
}
}
/* else if ((modestate == MS_WINDOWED) && _windowed_mouse.value)
CVAR_FIXME */
else if ((modestate == MS_WINDOWED) && _windowed_mouse->value)
{
IN_DeactivateMouse ();
@ -1645,38 +1612,19 @@ void VID_Init (unsigned char *palette)
memset(&devmode, 0, sizeof(devmode));
/* Cvar_RegisterVariable (&vid_mode);
CVAR_FIXME */
// Note that 0 is MODE_WINDOWED
vid_mode = Cvar_Get("vid_mode", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&vid_wait);
CVAR_FIXME */
vid_wait = Cvar_Get("vid_wait", "0", CVAR_NONE, "None");
/* Cvar_RegisterVariable (&vid_nopageflip);
CVAR_FIXME */
vid_nopageflip = Cvar_Get("vid_nopageflip", "0", CVAR_ARCHIVE, "None");
/* Cvar_RegisterVariable (&_vid_wait_override);
CVAR_FIXME */
_vid_wait_override = Cvar_Get("_vid_wait_override", "0", CVAR_ARCHIVE, "None");
/* Cvar_RegisterVariable (&_vid_default_mode);
CVAR_FIXME */
_vid_default_mode = Cvar_Get("_vid_default_mode", "0", CVAR_ARCHIVE, "None");
/* Cvar_RegisterVariable (&_vid_default_mode_win);
CVAR_FIXME */
// Note that 3 is MODE_FULLSCREEN_DEFAULT
_vid_default_mode_win = Cvar_Get("_vid_default_mode_win", "3", CVAR_ARCHIVE, "None");
/* Cvar_RegisterVariable (&vid_config_x);
CVAR_FIXME */
vid_wait = Cvar_Get("vid_wait", "0", CVAR_NONE, "None");
vid_nopageflip = Cvar_Get("vid_nopageflip", "0", CVAR_ARCHIVE, "None");
_vid_wait_override = Cvar_Get("_vid_wait_override", "0", CVAR_ARCHIVE, "None");
vid_config_x = Cvar_Get("vid_config_x", "800", CVAR_ARCHIVE, "None");
/* Cvar_RegisterVariable (&vid_config_y);
CVAR_FIXME */
vid_config_y = Cvar_Get("vid_config_y", "600", CVAR_ARCHIVE, "None");
/* Cvar_RegisterVariable (&vid_stretch_by_2);
CVAR_FIXME */
vid_stretch_by_2 = Cvar_Get("vid_stretch_by_2", "1", CVAR_ARCHIVE, "None");
/* Cvar_RegisterVariable (&_windowed_mouse);
CVAR_FIXME */
_windowed_mouse = Cvar_Get("_windowed_mouse", "0", CVAR_ARCHIVE, "None");
/* Cvar_RegisterVariable (&gl_ztrick);
CVAR_FIXME */
gl_ztrick = Cvar_Get("gl_ztrick", "1", CVAR_NONE, "None");
Cmd_AddCommand ("vid_nummodes", VID_NumModes_f);