diff options
| author | Tim Angus <tim@ngus.net> | 2009-10-03 11:41:24 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:14 +0000 |
| commit | 614a658030e59212335611596adb196b93e5b437 (patch) | |
| tree | b627256cb9b7f4d8c55490111a149d059da5053d /src/game/g_mover.c | |
| parent | ea433462e65a861b7123942151e882954f55f052 (diff) | |
* Merge clientSession_t::sessionTeam and clientSession_t::spectatorState
* Remove existing team_t (TEAM_FREE, TEAM_SPECTATOR)
* s/pTeam_t/team_t/;s/buildableTeam_t/team_t/;s/WUTeam_t/team_t/
* s/pClass_t/class_t/
* s/PERS_TEAM/PERS_SPECSTATE/
* s/STAT_PTEAM/STAT_TEAM/;s/STAT_PCLASS/STAT_CLASS/
Diffstat (limited to 'src/game/g_mover.c')
| -rw-r--r-- | src/game/g_mover.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/g_mover.c b/src/game/g_mover.c index 856f8cd5..1e290706 100644 --- a/src/game/g_mover.c +++ b/src/game/g_mover.c @@ -1303,7 +1303,7 @@ void Touch_DoorTrigger( gentity_t *ent, gentity_t *other, trace_t *trace ) if( other->s.eType == ET_BUILDABLE ) return; - if( other->client && other->client->sess.sessionTeam == TEAM_SPECTATOR ) + if( other->client && other->client->sess.spectatorState != SPECTATOR_NOT ) { // if the door is not open and not opening if( ent->parent->moverState != MOVER_1TO2 && @@ -2226,13 +2226,13 @@ void Blocked_Train( gentity_t *self, gentity_t *other ) vec3_t dir; gentity_t *tent; - if( other->biteam == BIT_ALIENS ) + if( other->buildableTeam == TEAM_ALIENS ) { VectorCopy( other->s.origin2, dir ); tent = G_TempEntity( other->s.origin, EV_ALIEN_BUILDABLE_EXPLOSION ); tent->s.eventParm = DirToByte( dir ); } - else if( other->biteam == BIT_HUMANS ) + else if( other->buildableTeam == TEAM_HUMANS ) { VectorSet( dir, 0.0f, 0.0f, 1.0f ); tent = G_TempEntity( other->s.origin, EV_HUMAN_BUILDABLE_EXPLOSION ); |