From 5c6ddb1c72281c118667c5b3bbf24b3a6b72b177 Mon Sep 17 00:00:00 2001
From: Bryce Hutchings <niceass@rq3.com>
Date: Thu, 6 Jun 2002 01:54:26 +0000
Subject: [PATCH] pressure change

---
 reaction/cgame/cg_local.h     | 6 +++++-
 reaction/cgame/cg_localents.c | 5 ++++-
 reaction/cgame/cg_main.c      | 8 +++++++-
 reaction/cgame/cg_marks.c     | 5 ++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h
index 5e12e275..075d27b9 100644
--- a/reaction/cgame/cg_local.h
+++ b/reaction/cgame/cg_local.h
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.86  2002/06/06 01:54:26  niceass
+// pressure change
+//
 // Revision 1.85  2002/06/05 23:36:07  niceass
 // "ready" command lag fix
 //
@@ -1081,7 +1084,8 @@ typedef struct {
 	qhandle_t	shotgunSmokePuffShader;
 	qhandle_t	plasmaBallShader;
 	qhandle_t	waterBubbleShader;
-	qhandle_t	waterParticleShader;
+	qhandle_t	waterPressureShader;
+	qhandle_t	flamePressureShader;
 	qhandle_t	bloodTrailShader;
 #ifdef MISSIONPACK
 	qhandle_t	nailPuffShader;
diff --git a/reaction/cgame/cg_localents.c b/reaction/cgame/cg_localents.c
index 79728425..2bf295c0 100644
--- a/reaction/cgame/cg_localents.c
+++ b/reaction/cgame/cg_localents.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.15  2002/06/06 01:54:07  niceass
+// pressure change
+//
 // Revision 1.14  2002/05/26 05:14:14  niceass
 // pressure stuff
 //
@@ -852,7 +855,7 @@ void CG_AddPressureEntity ( localEntity_t *le ) {
 		if (le->leFlags == LEF_WATER)
 			CG_ParticleWater(le->pos.trBase, velocity, 200 + rand() % 120, alpha, 2, 1 );
 		else if (le->leFlags == LEF_FLAME)
-			CG_ParticleSteam(le->pos.trBase, velocity, 200 + rand() % 120, alpha, 2, 1, cgs.media.grenadeExplosionShader );
+			CG_ParticleSteam(le->pos.trBase, velocity, 200 + rand() % 120, alpha, 2, 1, cgs.media.flamePressureShader );
 		else 
 			CG_ParticleSteam(le->pos.trBase, velocity, 200 + rand() % 120, alpha, 2, 1, cgs.media.smokePuffShader );
 	}
diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c
index 4ac82118..c9f3372f 100644
--- a/reaction/cgame/cg_main.c
+++ b/reaction/cgame/cg_main.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.72  2002/06/06 01:53:51  niceass
+// pressure change
+//
 // Revision 1.71  2002/06/05 23:35:42  niceass
 // "ready" command lag fix
 //
@@ -1278,7 +1281,10 @@ static void CG_RegisterGraphics( void ) {
 	cgs.media.bloodTrailShader = trap_R_RegisterShader( "bloodTrail" );
 	cgs.media.lagometerShader = trap_R_RegisterShader("lagometer" );
 	cgs.media.connectionShader = trap_R_RegisterShader( "disconnected" );
-	cgs.media.waterParticleShader = trap_R_RegisterShader( "gfx/misc/water.tga" ); // NiceAss: Used in pressure entities
+
+	cgs.media.waterPressureShader = trap_R_RegisterShader( "waterpressure" ); // NiceAss: Used in pressure entities
+	cgs.media.flamePressureShader = trap_R_RegisterShader( "flamepressure" ); // NiceAss: Used in pressure entities
+	
 	cgs.media.waterBubbleShader = trap_R_RegisterShader( "waterBubble" );
 
 	cgs.media.tracerShader = trap_R_RegisterShader( "gfx/misc/tracer" );
diff --git a/reaction/cgame/cg_marks.c b/reaction/cgame/cg_marks.c
index d670a00b..76dc8306 100644
--- a/reaction/cgame/cg_marks.c
+++ b/reaction/cgame/cg_marks.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.10  2002/06/06 01:53:26  niceass
+// pressure change
+//
 // Revision 1.9  2002/05/26 05:14:05  niceass
 // pressure stuff
 //
@@ -2329,7 +2332,7 @@ void CG_ParticleWater (vec3_t org, vec3_t vel, int duration, float alpha, float
 	p->endheight = 1.0 * scale;
 	p->endwidth = 1.0 * scale;
 	
-	p->pshader = cgs.media.waterParticleShader;
+	p->pshader = cgs.media.waterPressureShader;
 
 	p->type = P_SMOKE;