rq3
/
reaction
mirror of https://github.com/ReactionQuake3/reaction.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pressure change

This commit is contained in:
Bryce Hutchings 2002-06-06 01:54:26 +00:00
parent cf693dea2b
commit 5c6ddb1c72
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
reaction/cgame/cg_local.h
View File

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.86 2002/06/06 01:54:26 niceass
// pressure change
//
// Revision 1.85 2002/06/05 23:36:07 niceass // Revision 1.85 2002/06/05 23:36:07 niceass
// "ready" command lag fix // "ready" command lag fix
// //
@ -1081,7 +1084,8 @@ typedef struct {
qhandle_t shotgunSmokePuffShader; qhandle_t shotgunSmokePuffShader;
qhandle_t plasmaBallShader; qhandle_t plasmaBallShader;
qhandle_t waterBubbleShader; qhandle_t waterBubbleShader;
qhandle_t waterParticleShader; qhandle_t waterPressureShader;
qhandle_t flamePressureShader;
qhandle_t bloodTrailShader; qhandle_t bloodTrailShader;
#ifdef MISSIONPACK #ifdef MISSIONPACK
qhandle_t nailPuffShader; qhandle_t nailPuffShader;

5
reaction/cgame/cg_localents.c
View File

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.15 2002/06/06 01:54:07 niceass
// pressure change
//
// Revision 1.14 2002/05/26 05:14:14 niceass // Revision 1.14 2002/05/26 05:14:14 niceass
// pressure stuff // pressure stuff
// //
@ -852,7 +855,7 @@ void CG_AddPressureEntity ( localEntity_t *le ) {
if (le->leFlags == LEF_WATER) if (le->leFlags == LEF_WATER)
CG_ParticleWater(le->pos.trBase, velocity, 200 + rand() % 120, alpha, 2, 1 ); CG_ParticleWater(le->pos.trBase, velocity, 200 + rand() % 120, alpha, 2, 1 );
else if (le->leFlags == LEF_FLAME) 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 else
CG_ParticleSteam(le->pos.trBase, velocity, 200 + rand() % 120, alpha, 2, 1, cgs.media.smokePuffShader ); CG_ParticleSteam(le->pos.trBase, velocity, 200 + rand() % 120, alpha, 2, 1, cgs.media.smokePuffShader );
} }

8
reaction/cgame/cg_main.c
View File

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.72 2002/06/06 01:53:51 niceass
// pressure change
//
// Revision 1.71 2002/06/05 23:35:42 niceass // Revision 1.71 2002/06/05 23:35:42 niceass
// "ready" command lag fix // "ready" command lag fix
// //
@ -1278,7 +1281,10 @@ static void CG_RegisterGraphics( void ) {
cgs.media.bloodTrailShader = trap_R_RegisterShader( "bloodTrail" ); cgs.media.bloodTrailShader = trap_R_RegisterShader( "bloodTrail" );
cgs.media.lagometerShader = trap_R_RegisterShader("lagometer" ); cgs.media.lagometerShader = trap_R_RegisterShader("lagometer" );
cgs.media.connectionShader = trap_R_RegisterShader( "disconnected" ); 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.waterBubbleShader = trap_R_RegisterShader( "waterBubble" );
cgs.media.tracerShader = trap_R_RegisterShader( "gfx/misc/tracer" ); cgs.media.tracerShader = trap_R_RegisterShader( "gfx/misc/tracer" );

5
reaction/cgame/cg_marks.c
View File

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.10 2002/06/06 01:53:26 niceass
// pressure change
//
// Revision 1.9 2002/05/26 05:14:05 niceass // Revision 1.9 2002/05/26 05:14:05 niceass
// pressure stuff // 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->endheight = 1.0 * scale;
p->endwidth = 1.0 * scale; p->endwidth = 1.0 * scale;
p->pshader = cgs.media.waterParticleShader; p->pshader = cgs.media.waterPressureShader;
p->type = P_SMOKE; p->type = P_SMOKE;