qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-06-03 10:30:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

s/HAS_/HAVE_/g

Browse source
This commit is contained in:
Jeff Teunissen 2000-05-23 16:57:12 +00:00
parent fd35f176ba
commit 7bbb9963cc
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
source/vid_glx.c
View file

@ -4,10 +4,7 @@
OpenGL GLX video driver OpenGL GLX video driver
Copyright (C) 1996-1997 Id Software, Inc. Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999-2000 Nelson Rush.
Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se] Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se]
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -65,7 +62,7 @@
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#ifdef HAS_DGA #ifdef HAVE_DGA
# include <X11/extensions/xf86dga.h> # include <X11/extensions/xf86dga.h>
#endif #endif
#ifdef HAVE_VIDMODE #ifdef HAVE_VIDMODE
@ -101,7 +98,7 @@ extern cvar_t *vid_dga_mouseaccel;
static XF86VidModeModeInfo **vidmodes; static XF86VidModeModeInfo **vidmodes;
static int nummodes, hasvidmode = 0; static int nummodes, hasvidmode = 0;
#endif #endif
#ifdef HAS_DGA #ifdef HAVE_DGA
static int hasdgavideo = 0; static int hasdgavideo = 0;
static int hasdga = 0; static int hasdga = 0;
#endif #endif
@ -115,7 +112,7 @@ static GLboolean (*QF_XMesaSetFXmode)(GLint mode) = NULL;
int scr_width, scr_height; int scr_width, scr_height;
#if defined(XMESA) || defined(HAS_DGA) #if defined(XMESA) || defined(HAVE_DGA)
int VID_options_items = 2; int VID_options_items = 2;
#else #else
int VID_options_items = 1; int VID_options_items = 1;
@ -255,8 +252,8 @@ void VID_SetPalette (unsigned char *palette)
COM_FOpenFile("glquake/15to8.pal", &f); COM_FOpenFile("glquake/15to8.pal", &f);
if (f) { if (f) {
Qread(f, d_15to8table, 1<<15); fread(d_15to8table, 1<<15, 1, f);
Qclose(f); fclose(f);
} else { } else {
for (i=0; i < (1<<15); i++) { for (i=0; i < (1<<15); i++) {
/* Maps /* Maps
@ -284,9 +281,9 @@ void VID_SetPalette (unsigned char *palette)
snprintf(s, sizeof(s), "%s/glquake", com_gamedir); snprintf(s, sizeof(s), "%s/glquake", com_gamedir);
Sys_mkdir (s); Sys_mkdir (s);
snprintf(s, sizeof(s), "%s/glquake/15to8.pal", com_gamedir); snprintf(s, sizeof(s), "%s/glquake/15to8.pal", com_gamedir);
if ((f = Qopen(s, "wb")) != NULL) { if ((f = fopen(s, "wb")) != NULL) {
Qwrite(f, d_15to8table, 1<<15); fwrite(d_15to8table, 1<<15, 1, f);
Qclose(f); fclose(f);
} }
} }
} }
@ -422,7 +419,7 @@ void VID_Init(unsigned char *palette)
vid_mode = Cvar_Get ("vid_mode","0",0,"None"); vid_mode = Cvar_Get ("vid_mode","0",0,"None");
gl_ztrick = Cvar_Get ("gl_ztrick","0",CVAR_ARCHIVE,"None"); gl_ztrick = Cvar_Get ("gl_ztrick","0",CVAR_ARCHIVE,"None");
vid_fullscreen = Cvar_Get ("vid_fullscreen","0",0,"None"); vid_fullscreen = Cvar_Get ("vid_fullscreen","0",0,"None");
#ifdef HAS_DGA #ifdef HAVE_DGA
vid_dga_mouseaccel = Cvar_Get("vid_dga_mouseaccel","1",CVAR_ARCHIVE, vid_dga_mouseaccel = Cvar_Get("vid_dga_mouseaccel","1",CVAR_ARCHIVE,
"None"); "None");
#endif #endif
@ -469,7 +466,7 @@ void VID_Init(unsigned char *palette)
exit(1); exit(1);
} }
#ifdef HAS_DGA #ifdef HAVE_DGA
{ {
int maj_ver; int maj_ver;