summaryrefslogtreecommitdiff
path: root/src/game/g_active.c
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2001-02-05 03:14:44 +0000
committerTim Angus <tim@ngus.net>2001-02-05 03:14:44 +0000
commit96d1e6700762377bbfe54f30422ee0f532bea275 (patch)
treec4e311216bb70d2ad4a3f818250d97f62a3c3989 /src/game/g_active.c
parent76c534a0ef5d3d7ce318757d4be4675a9c63e8ae (diff)
Significantly reogranised how class properties are propogated between client/server. Started on Droid infest mechanism.
Diffstat (limited to 'src/game/g_active.c')
-rw-r--r--src/game/g_active.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c
index e2215014..0cf4f644 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -921,21 +921,18 @@ void ClientThink_real( gentity_t *ent ) {
//TA: look for MCU infront of player
if( ( client->buttons & BUTTON_GETFLAG ) && !( client->oldbuttons & BUTTON_GETFLAG ) )
{
- if( client->pers.pteam == PTE_HUMANS )
- {
- trace_t mcu;
- vec3_t view, point;
- gentity_t *traceEnt;
+ trace_t trace;
+ vec3_t view, point;
+ gentity_t *traceEnt;
- AngleVectors( client->ps.viewangles, view, NULL, NULL );
- VectorMA( client->ps.origin, 200, view, point );
- trap_Trace( &mcu, client->ps.origin, NULL, NULL, point, ent->s.number, MASK_SHOT );
+ AngleVectors( client->ps.viewangles, view, NULL, NULL );
+ VectorMA( client->ps.origin, 200, view, point );
+ trap_Trace( &trace, client->ps.origin, NULL, NULL, point, ent->s.number, MASK_SHOT );
- traceEnt = &g_entities[ mcu.entityNum ];
+ traceEnt = &g_entities[ trace.entityNum ];
- if( traceEnt->use )
- traceEnt->use( traceEnt, ent, ent ); //other and activator are the same in this context
- }
+ if( traceEnt->use )
+ traceEnt->use( traceEnt, ent, ent ); //other and activator are the same in this context
}
// check for respawning