glquake.h: Comment out <GL/glu.h> -- may be used in the future, but we

don't use libGLU right now.

gl_draw.c: brightness/contrast are created in r_view.c, I'm a little
surprised this didn't cause a crash.

menu.c: Use bound() for sliders.
This commit is contained in:
Jeff Teunissen 2000-09-25 04:12:58 +00:00
parent a38f854210
commit bf2ec8da6d
3 changed files with 2 additions and 11 deletions

View file

@ -45,7 +45,7 @@
#endif
#include <GL/gl.h>
#include <GL/glu.h>
//#include <GL/glu.h>
#include "model.h"
#include "render.h"

View file

@ -73,8 +73,6 @@ cvar_t *gl_conalpha;
cvar_t *gl_conspin;
cvar_t *cl_verstring;
cvar_t *gl_lightmode; // LordHavoc: lighting mode
cvar_t *brightness; // LordHavoc: brightness multiplier
cvar_t *contrast; // LordHavoc: contrast scaler
extern byte *draw_chars; // 8*8 graphic characters
qpic_t *draw_disc;
@ -406,10 +404,6 @@ void Draw_Init (void)
// LordHavoc: lighting mode
gl_lightmode = Cvar_Get("gl_lightmode", "1", CVAR_ARCHIVE,
"Lighting mode (0 = GLQuake style, 1 = new style)");
brightness = Cvar_Get("brightness", "1", CVAR_ARCHIVE,
"Brightness");
contrast = Cvar_Get("contrast", "1", CVAR_ARCHIVE,
"contrast");
gl_nobind = Cvar_Get("gl_nobind", "0", CVAR_NONE,
"whether or not to inhibit texture binding");
gl_max_size = Cvar_Get("gl_max_size", "1024", CVAR_NONE,

View file

@ -470,10 +470,7 @@ void M_DrawSlider (int x, int y, float range)
{
int i;
if (range < 0)
range = 0;
if (range > 1)
range = 1;
range = bound (0, range, 1);
M_DrawCharacter (x-8, y, 128);
for (i=0 ; i<SLIDER_RANGE ; i++)
M_DrawCharacter (x + i*8, y, 129);