diff options
| -rw-r--r-- | src/game/g_active.c | 5 | ||||
| -rw-r--r-- | src/game/g_admin.c | 5 | ||||
| -rw-r--r-- | src/game/g_buildable.c | 16 | ||||
| -rw-r--r-- | src/game/g_client.c | 2 |
4 files changed, 11 insertions, 17 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index ddc0669..a6f246c 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -1472,7 +1472,6 @@ void ClientThink_real( gentity_t *ent ) int msec; usercmd_t *ucmd; int real_pm_type; - pTeam_t team; client = ent->client; @@ -1925,12 +1924,12 @@ void ClientThink_real( gentity_t *ent ) if( g_practise.integer ) { - if( team = PTE_ALIENS ) + if( client->pers.teamSelection == PTE_ALIENS ) { if( client->pers.credit < 9 ) G_AddCreditToClient( client, 9, qtrue ); } - if( team = PTE_HUMANS ) + if( client->pers.teamSelection == PTE_HUMANS ) { if( client->pers.credit < 2000 ) G_AddCreditToClient( client, 2000, qtrue ); diff --git a/src/game/g_admin.c b/src/game/g_admin.c index 81acd88..de9f7fe 100644 --- a/src/game/g_admin.c +++ b/src/game/g_admin.c @@ -8715,10 +8715,7 @@ qboolean G_admin_practise( gentity_t *ent, int skiparg ) return qfalse; } - if( ent ) - ent->flags ^= FL_NOTARGET; - - AP( va( "print \"^3!practise: ^7practise mode was %s by %s\n\"", + AP( va( "print \"^3!practise: ^7practise mode was %s by %s^7\n\"", arg, ( ent ) ? G_admin_adminPrintName( ent ) : "console" ) ); diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 2e2a2d8..30b9d20 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -479,7 +479,7 @@ static void G_CreepSlow( gentity_t *self ) { enemy = &g_entities[ entityList[ i ] ]; - if( enemy->flags & FL_NOTARGET ) + if( enemy->flags & FL_NOTARGET || g_practise.integer ) continue; if( enemy->client && enemy->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS && @@ -822,7 +822,7 @@ void AOvermind_Think( gentity_t *self ) { enemy = &g_entities[ entityList[ i ] ]; - if( enemy->flags & FL_NOTARGET ) + if( enemy->flags & FL_NOTARGET || g_practise.integer ) continue; if( enemy->client && enemy->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS ) @@ -1222,7 +1222,7 @@ void AAcidTube_Think( gentity_t *self ) { enemy = &g_entities[ entityList[ i ] ]; - if( enemy->flags & FL_NOTARGET ) + if( enemy->flags & FL_NOTARGET || g_practise.integer ) continue; if( !G_Visible( self, enemy ) ) @@ -1295,7 +1295,7 @@ void AHive_Think( gentity_t *self ) { enemy = &g_entities[ entityList[ i ] ]; - if( enemy->flags & FL_NOTARGET ) + if( enemy->flags & FL_NOTARGET || g_practise.integer ) continue; if( enemy->health <= 0 ) @@ -1770,7 +1770,7 @@ qboolean ATrapper_CheckTarget( gentity_t *self, gentity_t *target, int range ) return qfalse; if( !target->client ) // is the target a bot or player? return qfalse; - if( target->flags & FL_NOTARGET ) // is the target cheating? + if( target->flags & FL_NOTARGET || g_practise.integer ) // is the target cheating? return qfalse; if( target->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS ) // one of us? return qfalse; @@ -1961,7 +1961,7 @@ void HReactor_Think( gentity_t *self ) { enemy = &g_entities[ entityList[ i ] ]; - if( enemy->flags & FL_NOTARGET ) + if( enemy->flags & FL_NOTARGET || g_practise.integer ) continue; if( enemy->client && enemy->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS ) @@ -2313,7 +2313,7 @@ qboolean HMGTurret_CheckTarget( gentity_t *self, gentity_t *target, qboolean ign if( !target ) return qfalse; - if( target->flags & FL_NOTARGET ) + if( target->flags & FL_NOTARGET || g_practise.integer ) return qfalse; if( !target->client ) @@ -2538,7 +2538,7 @@ void HTeslaGen_Think( gentity_t *self ) { enemy = &g_entities[ entityList[ i ] ]; - if( enemy->flags & FL_NOTARGET ) + if( enemy->flags & FL_NOTARGET || g_practise.integer ) continue; if( enemy->client && enemy->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS && diff --git a/src/game/g_client.c b/src/game/g_client.c index 999c4b2..d204831 100644 --- a/src/game/g_client.c +++ b/src/game/g_client.c @@ -1864,8 +1864,6 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles ent->flags = 0; if( ent->client->pers.godMode ) ent->flags += FL_GODMODE; - if( g_practise.integer ) - ent->flags += FL_NOTARGET; //TA: calculate each client's acceleration ent->evaluateAcceleration = qtrue; |