From 0c7cc403b806b3d431590bf8b49786f0fa1ab9b5 Mon Sep 17 00:00:00 2001 From: Ragnvald Maartmann-Moe IV Date: Sat, 19 May 2001 17:02:56 +0000 Subject: [PATCH] diff noise reduction. --- nq/include/protocol.h | 6 ++++-- nq/source/gl_rmisc.c | 6 +++--- nq/source/gl_view.c | 9 +++------ qw/source/gl_view.c | 14 ++++++-------- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/nq/include/protocol.h b/nq/include/protocol.h index 358c64811..5107ec2fd 100644 --- a/nq/include/protocol.h +++ b/nq/include/protocol.h @@ -174,9 +174,11 @@ #define TE_RAILTRAIL 15 #endif #define TE_EXPLOSION2 16 -// PGM 01/21/97 +// PGM 01/21/97 #define TE_BEAM 17 -// PGM 01/21/97 +// PGM 01/21/97 + +#define MAX_CLIENTS 16 typedef struct entity_state_s { diff --git a/nq/source/gl_rmisc.c b/nq/source/gl_rmisc.c index a7583455e..3e23441a1 100644 --- a/nq/source/gl_rmisc.c +++ b/nq/source/gl_rmisc.c @@ -155,11 +155,11 @@ R_Init (void) GDT_Init (); - //XXX netgraphtexture = texture_extension_number; - //XXX texture_extension_number++; + netgraphtexture = texture_extension_number; + texture_extension_number++; playertextures = texture_extension_number; - texture_extension_number += 16;//MAX_CLIENTS; + texture_extension_number += MAX_CLIENTS; player_fb_textures = texture_extension_number; texture_extension_number += MAX_CACHED_SKINS; diff --git a/nq/source/gl_view.c b/nq/source/gl_view.c index 1c4b7c15b..27aa770a5 100644 --- a/nq/source/gl_view.c +++ b/nq/source/gl_view.c @@ -53,15 +53,13 @@ extern qboolean V_CheckGamma (void); extern void V_CalcIntermissionRefdef (void); extern void V_CalcRefdef (void); -extern cvar_t *gl_cshiftpercent; -extern cvar_t *cl_cshift_powerup; - +extern cvar_t *gl_cshiftpercent; +extern cvar_t *cl_cshift_powerup; byte ramps[3][256]; float v_blend[4]; - /* V_CalcBlend @@ -124,8 +122,7 @@ V_CalcPowerupCshift (void) if ((gl_dlight_polyblend->int_val || !(gl_dlight_lightmap->int_val && gl_dlight_polyblend->int_val)) && (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY || - cl.stats[STAT_ITEMS] & IT_QUAD)) - { + cl.stats[STAT_ITEMS] & IT_QUAD)) { if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY && cl.stats[STAT_ITEMS] & IT_QUAD) { cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 255; diff --git a/qw/source/gl_view.c b/qw/source/gl_view.c index 9e19b7d2f..502d13fcd 100644 --- a/qw/source/gl_view.c +++ b/qw/source/gl_view.c @@ -52,13 +52,11 @@ extern byte gammatable[256]; extern qboolean V_CheckGamma (void); extern cvar_t *cl_cshift_powerup; -extern cvar_t *contrast; byte ramps[3][256]; float v_blend[4]; - /* V_CalcBlend @@ -115,16 +113,16 @@ void V_CalcPowerupCshift (void) { if (!cl_cshift_powerup->int_val - || (atoi (Info_ValueForKey (cl.serverinfo, "cshifts")) & INFO_CSHIFT_POWERUP)) + || (atoi (Info_ValueForKey (cl.serverinfo, "cshifts")) & + INFO_CSHIFT_POWERUP)) return; if ((gl_dlight_polyblend->int_val || - !(gl_dlight_lightmap->int_val && gl_dlight_polyblend->int_val)) && - (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY || - cl.stats[STAT_ITEMS] & IT_QUAD)) - { + !(gl_dlight_lightmap->int_val && gl_dlight_polyblend->int_val)) && + (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY || + cl.stats[STAT_ITEMS] & IT_QUAD)) { if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY && - cl.stats[STAT_ITEMS] & IT_QUAD) { + cl.stats[STAT_ITEMS] & IT_QUAD) { cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 255; cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 0; cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 255;