Console commands cleanup

This commit is contained in:
cholleme 2003-06-25 09:28:30 +00:00
parent 02f88d9c59
commit 2221a5e555
3 changed files with 23 additions and 24 deletions

View file

@ -92,7 +92,7 @@ extern float gldepthmin, gldepthmax;
void GL_Upload32 (unsigned *data, int width, int height, qboolean mipmap, qboolean alpha);
void GL_Upload8 (byte *data,char *identifier, int width, int height, qboolean mipmap, qboolean alpha, qboolean bump);
int GL_LoadTexture (char *identifier, int width, int height, byte *data, qboolean mipmap, qboolean alpha, qboolean bump);
//int GL_LoadTexture (char *identifier, int width, int height, byte *data, qboolean mipmap, qboolean alpha, qboolean bump);
int GL_FindTexture (char *identifier);
typedef struct
@ -314,35 +314,24 @@ extern cvar_t cg_showviewmodel;
extern cvar_t r_waterwarp;
extern cvar_t r_fullbright;
extern cvar_t r_lightmap;
extern cvar_t r_shadows;
extern cvar_t r_mirroralpha;
extern cvar_t r_wateralpha;
extern cvar_t r_dynamic;
extern cvar_t r_novis;
extern cvar_t gl_clear;
extern cvar_t gl_cull;
extern cvar_t gl_poly;
//extern cvar_t gl_texsort;
extern cvar_t gl_polyblend;
//extern cvar_t gl_keeptjunctions; PENTA: dont remove t-junctions
extern cvar_t gl_reporttjunctions;
extern cvar_t gl_flashblend;
extern cvar_t gl_nocolors;
extern cvar_t gl_doubleeyes;
extern int gl_lightmap_format;
extern int gl_solid_format;
extern int gl_alpha_format;
extern cvar_t gl_max_size;
extern cvar_t gl_playermip;
extern cvar_t gl_watershader; //PENTA:
extern cvar_t gl_calcdepth;
extern cvar_t sh_lightmapbright; //PENTA:
extern cvar_t sh_radiusscale;
extern cvar_t sh_visiblevolumes;
extern cvar_t sh_entityshadows;
extern cvar_t sh_meshshadows;
@ -360,7 +349,6 @@ extern cvar_t sh_infinitevolumes;//PENTA:
extern cvar_t sh_noscissor;
extern cvar_t sh_nocleversave;
extern cvar_t sh_bumpmaps;//PENTA: enable disable bump mapping
extern cvar_t sh_colormaps;//PENTA: enable disable textures on the world (light will remain)
extern cvar_t sh_playershadow;//PENTA: the player casts a shadow (the one YOU are playing with, others always cast shadows)
extern cvar_t sh_nocache;
extern cvar_t sh_glares;
@ -418,7 +406,6 @@ extern const char *gl_renderer;
extern const char *gl_version;
extern const char *gl_extensions;
void R_TranslatePlayerSkin (int playernum);
void GL_Bind (int texnum);
#ifndef _WIN32
@ -1400,12 +1387,12 @@ void EmitMirrorPolys (msurface_t *fa);
void EmitMirrorWaterPolys (msurface_t *fa);
void EmitSkyPolys (msurface_t *fa);
void EmitWaterPolys (msurface_t *fa);
void InitShaderTex (void);
//void InitShaderTex (void);
void LoadColorTGA (FILE *fin, byte *pixels, int *width, int *height);
void LoadGrayTGA (FILE *fin,byte *pixels,int *width, int *height);
int LoadTextureInPlace(char* filename, int size, byte* mem, int* width, int* height);
void LoadTGA (FILE *fin);
qboolean OverrideFluidTex (char *name);
//qboolean OverrideFluidTex (char *name);
void ProjectPlane (const vec3_t src,const vec3_t v1,const vec3_t v2,vec3_t dst);
void TraceLine (vec3_t start, vec3_t end, vec3_t impact);
@ -1479,7 +1466,6 @@ extern int lightmap_textures;
void Draw_TextureMode_f (void);
extern cvar_t gl_nobind;
extern cvar_t gl_max_size;
extern cvar_t gl_picmip;
extern cvar_t gl_gloss;

View file

@ -473,6 +473,19 @@ void VectorScale (vec3_t in, vec_t scale, vec3_t out)
}
void VectorMax(vec3_t i1, vec3_t i2, vec3_t r) {
r[0] = max(i1[0],i2[0]);
r[1] = max(i1[1],i2[1]);
r[2] = max(i1[2],i2[2]);
}
void VectorMin(vec3_t i1, vec3_t i2, vec3_t r) {
r[0] = min(i1[0],i2[0]);
r[1] = min(i1[1],i2[1]);
r[2] = min(i1[2],i2[2]);
}
int Q_log2(int val)
{
int answer=0;

14
menu.c
View file

@ -1183,12 +1183,12 @@ void M_AdjustSliders (int dir)
Cvar_SetValue ("viewsize", scr_viewsize.value);
break;
case 4: // gamma
v_gamma.value -= dir * 0.05;
if (v_gamma.value < 0.5)
v_gamma.value = 0.5;
if (v_gamma.value > 1)
v_gamma.value = 1;
Cvar_SetValue ("gamma", v_gamma.value);
r_intensity.value -= dir * 0.05;
if (r_intensity.value < 0.5)
r_intensity.value = 0.5;
if (r_intensity.value > 1)
r_intensity.value = 1;
Cvar_SetValue ("gamma", r_intensity.value);
break;
case 5: // mouse speed
sensitivity.value += dir * 0.5;
@ -1317,7 +1317,7 @@ void M_Options_Draw (void)
M_DrawSlider (220, 56, r);
M_Print (16, 64, " Brightness");
r = (1.0 - v_gamma.value) / 0.5;
r = (1.0 - r_intensity.value) / 0.5;
M_DrawSlider (220, 64, r);
M_Print (16, 72, " Mouse Speed");