From 765dc3c634192b9f85363bbaaf8fb4b960802300 Mon Sep 17 00:00:00 2001 From: Bryce Hutchings Date: Mon, 29 Apr 2002 06:14:57 +0000 Subject: [PATCH] pressure --- reaction/cgame/cg_effects.c | 7 +++++-- reaction/cgame/cg_event.c | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/reaction/cgame/cg_effects.c b/reaction/cgame/cg_effects.c index a9c3ee8d..9fdc6708 100644 --- a/reaction/cgame/cg_effects.c +++ b/reaction/cgame/cg_effects.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.29 2002/04/29 06:14:10 niceass +// pressure +// // Revision 1.28 2002/04/26 03:39:34 jbravo // added tkok, fixed players always leaving zcam modes when player thats // beeing tracked dies @@ -1328,14 +1331,14 @@ void CG_BreakBreakable( centity_t *cent,int eParam, int number ) { } -void CG_PressureWater( vec3_t origin, vec3_t dir ) +void CG_Pressure( vec3_t origin, vec3_t dir, centity_t *cent ) { localEntity_t *le; refEntity_t *re; le = CG_AllocLocalEntity(); re = &le->refEntity; - le->leType = LE_PRESSURE_WATER; + le->leType = LE_PRESSURE; VectorCopy(origin, le->pos.trBase); VectorCopy(dir, le->pos.trDelta); le->startTime = cg.time; diff --git a/reaction/cgame/cg_event.c b/reaction/cgame/cg_event.c index 3de67766..be010e24 100644 --- a/reaction/cgame/cg_event.c +++ b/reaction/cgame/cg_event.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.52 2002/04/29 06:14:57 niceass +// pressure +// // Revision 1.51 2002/04/23 06:08:58 niceass // pressure stuff // @@ -2564,10 +2567,10 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) { DEBUGNAME("EV_CHIP_GLASS"); CG_BreakGlass( cent->lerpOrigin, es->eventParm, es->number, 1, 1 ); break; - case EV_PRESSURE_WATER: - DEBUGNAME("EV_PRESSURE_WATER"); + case EV_PRESSURE: + DEBUGNAME("EV_PRESSURE"); ByteToDir(es->eventParm, dir); - CG_PressureWater( position, dir ); + CG_Pressure( position, dir, cent ); break; case EV_STOPLOOPINGSOUND: