diff options
| -rw-r--r-- | src/cl_fx.c | 13 | ||||
| -rw-r--r-- | src/cl_local.h | 4 | ||||
| -rw-r--r-- | src/cl_parse.c | 40 |
3 files changed, 21 insertions, 36 deletions
diff --git a/src/cl_fx.c b/src/cl_fx.c index a250ecd..6196649 100644 --- a/src/cl_fx.c +++ b/src/cl_fx.c @@ -231,10 +231,10 @@ void CL_AddDLights (void) /* ============== -CL_ParseMuzzleFlash +CL_MuzzleFlash ============== */ -void CL_ParseMuzzleFlash (void) +void CL_MuzzleFlash (void) { #if USE_DLIGHTS vec3_t fv, rv; @@ -244,6 +244,11 @@ void CL_ParseMuzzleFlash (void) float volume; char soundname[MAX_QPATH]; +#ifdef _DEBUG + if( developer->integer ) + CL_CheckEntityPresent( mz.entity, "muzzleflash" ); +#endif + pl = &cl_entities[mz.entity]; #if USE_DLIGHTS @@ -423,10 +428,10 @@ void CL_ParseMuzzleFlash (void) /* ============== -CL_ParseMuzzleFlash2 +CL_MuzzleFlash2 ============== */ -void CL_ParseMuzzleFlash2 (void) +void CL_MuzzleFlash2 (void) { centity_t *ent; vec3_t origin; diff --git a/src/cl_local.h b/src/cl_local.h index 39a1865..8fc810e 100644 --- a/src/cl_local.h +++ b/src/cl_local.h @@ -694,8 +694,8 @@ void CL_QuadTrail (vec3_t start, vec3_t end); void CL_OldRailTrail (void); void CL_BubbleTrail (vec3_t start, vec3_t end); void CL_FlagTrail (vec3_t start, vec3_t end, int color); -void CL_ParseMuzzleFlash (void); -void CL_ParseMuzzleFlash2 (void); +void CL_MuzzleFlash (void); +void CL_MuzzleFlash2 (void); void CL_TeleporterParticles (vec3_t org); void CL_TeleportParticles (vec3_t org); void CL_ParticleEffect (vec3_t org, vec3_t dir, int color, int count); diff --git a/src/cl_parse.c b/src/cl_parse.c index 3866a76..507aa6c 100644 --- a/src/cl_parse.c +++ b/src/cl_parse.c @@ -683,7 +683,7 @@ tent_params_t te; mz_params_t mz; snd_params_t snd; -static void CL_ParseTEntParams( void ) { +static void CL_ParseTEntPacket( void ) { te.type = MSG_ReadByte(); switch( te.type ) { @@ -802,11 +802,9 @@ static void CL_ParseTEntParams( void ) { default: Com_Error( ERR_DROP, "%s: bad type", __func__ ); } - - CL_ParseTEnt(); } -static void CL_ParseMuzzleFlashParams( void ) { +static void CL_ParseMuzzleFlashPacket( int mask ) { int entity, weapon; entity = MSG_ReadShort(); @@ -814,30 +812,9 @@ static void CL_ParseMuzzleFlashParams( void ) { Com_Error( ERR_DROP, "%s: bad entity", __func__ ); weapon = MSG_ReadByte(); - mz.silenced = weapon & MZ_SILENCED; - mz.weapon = weapon & ~MZ_SILENCED; + mz.silenced = weapon & mask; + mz.weapon = weapon & ~mask; mz.entity = entity; - -#ifdef _DEBUG - if( developer->integer ) { - CL_CheckEntityPresent( entity, "muzzleflash" ); - } -#endif - - CL_ParseMuzzleFlash(); -} - -static void CL_ParseMuzzleFlashParams2( void ) { - int entity; - - entity = MSG_ReadShort(); - if( entity < 1 || entity >= MAX_EDICTS ) - Com_Error( ERR_DROP, "%s: bad entity", __func__ ); - - mz.weapon = MSG_ReadByte(); - mz.entity = entity; - - CL_ParseMuzzleFlash2(); } /* @@ -1261,15 +1238,18 @@ void CL_ParseServerMessage( void ) { break; case svc_temp_entity: - CL_ParseTEntParams(); + CL_ParseTEntPacket(); + CL_ParseTEnt(); break; case svc_muzzleflash: - CL_ParseMuzzleFlashParams(); + CL_ParseMuzzleFlashPacket( MZ_SILENCED ); + CL_MuzzleFlash(); break; case svc_muzzleflash2: - CL_ParseMuzzleFlashParams2(); + CL_ParseMuzzleFlashPacket( 0 ); + CL_MuzzleFlash2(); break; case svc_download: |