qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-18 06:51:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

ok, qw-client-wgl.exe works now (helps if scr_width and scr_height are set)

Browse source
This commit is contained in:
Bill Currie 2001-10-22 02:15:30 +00:00
parent 2467671c72
commit 9a5ec9c187
1 changed files with 13 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
libs/video/targets/vid_wgl.c
View file

@ -58,6 +58,7 @@ static const char rcsid[] =
extern void GL_Pre_Init (void); extern void GL_Pre_Init (void);
extern void GL_Init_Common (void); extern void GL_Init_Common (void);
extern void VID_Init8bitPalette (void); extern void VID_Init8bitPalette (void);
extern void GL_Common_Init_Cvars (void);
extern void (*vid_menudrawfn) (void); extern void (*vid_menudrawfn) (void);
extern void (*vid_menukeyfn) (int); extern void (*vid_menukeyfn) (int);
@ -110,9 +111,6 @@ const char *gl_renderer;
const char *gl_version; const char *gl_version;
const char *gl_extensions; const char *gl_extensions;
// 8-bit and permedia support
qboolean isPermedia = false;
// FIXME: Only used by MGL .. // FIXME: Only used by MGL ..
qboolean DDActive; qboolean DDActive;
@ -149,9 +147,6 @@ LONG CDAudio_MessageHandler (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
extern viddef_t vid; // global video state extern viddef_t vid; // global video state
unsigned int d_8to24table[256];
unsigned char d_15to8table[65536];
float gldepthmin, gldepthmax; float gldepthmin, gldepthmax;
modestate_t modestate = MS_UNINIT; modestate_t modestate = MS_UNINIT;
@ -254,8 +249,8 @@ VID_SetWindowedMode (int modenum)
vid.conheight = modelist[modenum].height; vid.conheight = modelist[modenum].height;
if (vid.conwidth > modelist[modenum].width) if (vid.conwidth > modelist[modenum].width)
vid.conwidth = modelist[modenum].width; vid.conwidth = modelist[modenum].width;
vid.width = vid.conwidth; scr_width = vid.width = vid.conwidth;
vid.height = vid.conheight; scr_height = vid.height = vid.conheight;
vid.numpages = 2; vid.numpages = 2;
@ -338,8 +333,8 @@ VID_SetFullDIBMode (int modenum)
vid.conheight = modelist[modenum].height; vid.conheight = modelist[modenum].height;
if (vid.conwidth > modelist[modenum].width) if (vid.conwidth > modelist[modenum].width)
vid.conwidth = modelist[modenum].width; vid.conwidth = modelist[modenum].width;
vid.width = vid.conwidth; scr_width = vid.width = vid.conwidth;
vid.height = vid.conheight; scr_height = vid.height = vid.conheight;
vid.numpages = 2; vid.numpages = 2;
@ -461,9 +456,6 @@ GL_Init (void)
GL_Init_Common (); GL_Init_Common ();
if (strnicmp (gl_renderer, "PowerVR", 7) == 0) if (strnicmp (gl_renderer, "PowerVR", 7) == 0)
fullsbardraw = true; fullsbardraw = true;
if (strnicmp (gl_renderer, "Permedia", 8) == 0)
isPermedia = true;
} }
void void
@ -1132,7 +1124,6 @@ VID_Init (unsigned char *palette)
{ {
int i, existingmode; int i, existingmode;
int basenummodes, width, height=480, bpp, findbpp, done; int basenummodes, width, height=480, bpp, findbpp, done;
char gldir[MAX_OSPATH];
HDC hdc; HDC hdc;
DEVMODE devmode; DEVMODE devmode;
HGLRC baseRC; HGLRC baseRC;
@ -1252,8 +1243,7 @@ VID_Init (unsigned char *palette)
do { do {
if (COM_CheckParm ("-height")) { if (COM_CheckParm ("-height")) {
height = atoi (com_argv[COM_CheckParm ("-height") height = atoi (com_argv[COM_CheckParm ("-height") + 1]);
+ 1]);
for (i = 1, vid_default = 0; i < nummodes; i++) { for (i = 1, vid_default = 0; i < nummodes; i++) {
if ((modelist[i].width == width) && if ((modelist[i].width == width) &&
@ -1304,8 +1294,6 @@ VID_Init (unsigned char *palette)
} }
} }
vid.initialized = true;
if ((i = COM_CheckParm ("-conwidth")) != 0) if ((i = COM_CheckParm ("-conwidth")) != 0)
vid.conwidth = atoi (com_argv[i + 1]); vid.conwidth = atoi (com_argv[i + 1]);
else else
@ -1330,13 +1318,10 @@ VID_Init (unsigned char *palette)
vid.fullbright = 256 - LittleLong (*((int *) vid.colormap8 + 2048)); vid.fullbright = 256 - LittleLong (*((int *) vid.colormap8 + 2048));
#ifdef SPLASH_SCREEN #ifdef SPLASH_SCREEN
if(hwnd_dialog) if(hwnd_dialog)
DestroyWindow (hwnd_dialog); DestroyWindow (hwnd_dialog);
#endif #endif
VID_InitGamma (palette);
VID_SetPalette (palette);
VID_SetMode (vid_default, palette); VID_SetMode (vid_default, palette);
maindc = GetDC (mainwindow); maindc = GetDC (mainwindow);
@ -1363,14 +1348,14 @@ VID_Init (unsigned char *palette)
GL_Init (); GL_Init ();
snprintf (gldir, sizeof (gldir), "%s/glquake", com_gamedir); VID_InitGamma (palette);
Sys_mkdir (gldir); VID_Init8bitPalette ();
VID_SetPalette (palette);
vid.initialized = true;
vid_realmode = vid_modenum; vid_realmode = vid_modenum;
// Check for 3DFX Extensions and initialize them.
VID_Init8bitPalette ();
strcpy (badmode.modedesc, "Bad mode"); strcpy (badmode.modedesc, "Bad mode");
vid_canalttab = true; vid_canalttab = true;