diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/g_combat.c | 12 | ||||
| -rw-r--r-- | src/game/g_local.h | 2 | ||||
| -rw-r--r-- | src/game/g_main.c | 23 | ||||
| -rw-r--r-- | src/ui/ui_gameinfo.c | 6 |
4 files changed, 7 insertions, 36 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 8b5877cf..80278f9a 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -1020,17 +1020,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, // check if friendly fire has been disabled if( !g_friendlyFire.integer ) { - if( !g_friendlyFireHumans.integer && - targ->client->ps.stats[ STAT_TEAM ] == TEAM_HUMANS ) - { - return; - } - - if( !g_friendlyFireAliens.integer && - targ->client->ps.stats[ STAT_TEAM ] == TEAM_ALIENS ) - { - return; - } + return; } } diff --git a/src/game/g_local.h b/src/game/g_local.h index 9d6feb5f..492bce49 100644 --- a/src/game/g_local.h +++ b/src/game/g_local.h @@ -1058,8 +1058,6 @@ extern vmCvar_t g_timelimit; extern vmCvar_t g_suddenDeathTime; extern vmCvar_t g_suddenDeath; extern vmCvar_t g_friendlyFire; -extern vmCvar_t g_friendlyFireHumans; -extern vmCvar_t g_friendlyFireAliens; extern vmCvar_t g_friendlyBuildableFire; extern vmCvar_t g_dretchPunt; extern vmCvar_t g_password; diff --git a/src/game/g_main.c b/src/game/g_main.c index e2f9eaaa..902f9a0c 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -44,8 +44,6 @@ vmCvar_t g_suddenDeathTime; vmCvar_t g_suddenDeath; vmCvar_t g_capturelimit; vmCvar_t g_friendlyFire; -vmCvar_t g_friendlyFireAliens; -vmCvar_t g_friendlyFireHumans; vmCvar_t g_friendlyBuildableFire; vmCvar_t g_dretchPunt; vmCvar_t g_password; @@ -170,10 +168,8 @@ static cvarTable_t gameCvarTable[ ] = { &g_synchronousClients, "g_synchronousClients", "0", CVAR_SYSTEMINFO, 0, qfalse }, - { &g_friendlyFire, "g_friendlyFire", "0", CVAR_ARCHIVE, 0, qtrue }, - { &g_friendlyFireAliens, "g_friendlyFireAliens", "0", CVAR_ARCHIVE, 0, qtrue }, - { &g_friendlyFireHumans, "g_friendlyFireHumans", "0", CVAR_ARCHIVE, 0, qtrue }, - { &g_friendlyBuildableFire, "g_friendlyBuildableFire", "0", CVAR_ARCHIVE, 0, qtrue }, + { &g_friendlyFire, "g_friendlyFire", "0", CVAR_SERVERINFO | CVAR_ARCHIVE, 0, qtrue }, + { &g_friendlyBuildableFire, "g_friendlyBuildableFire", "0", CVAR_SERVERINFO | CVAR_ARCHIVE, 0, qtrue }, { &g_dretchPunt, "g_dretchPunt", "0", CVAR_ARCHIVE, 0, qtrue }, { &g_teamForceBalance, "g_teamForceBalance", "0", CVAR_ARCHIVE }, @@ -478,12 +474,8 @@ void G_UpdateCvars( void ) cv->modificationCount = cv->vmCvar->modificationCount; if( cv->trackChange ) - { trap_SendServerCommand( -1, va( "print \"Server: %s changed to %s\n\"", cv->cvarName, cv->vmCvar->string ) ); - // update serverinfo in case this cvar is passed to clients indirectly - CalculateRanks( ); - } } } } @@ -1417,7 +1409,6 @@ void CalculateRanks( void ) { int i; char P[ MAX_CLIENTS + 1 ] = {""}; - int ff = 0; level.numConnectedClients = 0; level.numPlayingClients = 0; @@ -1465,16 +1456,6 @@ void CalculateRanks( void ) P[ i ] = '\0'; trap_Cvar_Set( "P", P ); - if( g_friendlyFire.integer ) - ff |= ( FFF_HUMANS | FFF_ALIENS ); - if( g_friendlyFireHumans.integer ) - ff |= FFF_HUMANS; - if( g_friendlyFireAliens.integer ) - ff |= FFF_ALIENS; - if( g_friendlyBuildableFire.integer ) - ff |= FFF_BUILDABLES; - trap_Cvar_Set( "ff", va( "%i", ff ) ); - qsort( level.sortedClients, level.numConnectedClients, sizeof( level.sortedClients[ 0 ] ), SortRanks ); diff --git a/src/ui/ui_gameinfo.c b/src/ui/ui_gameinfo.c index c11f7248..b39be790 100644 --- a/src/ui/ui_gameinfo.c +++ b/src/ui/ui_gameinfo.c @@ -365,8 +365,10 @@ void UI_ServerInfo( void ) Info_ValueForKey( info, "version" ) ); trap_Cvar_Set( "ui_serverinfo_unlagged", Info_ValueForKey( info, "g_unlagged" ) ); - trap_Cvar_Set( "ui_serverinfo_ff", - Info_ValueForKey( info, "ff" ) ); + trap_Cvar_Set( "ui_serverinfo_friendlyFire", + Info_ValueForKey( info, "g_friendlyFire" ) ); + trap_Cvar_Set( "ui_serverinfo_friendlyBuildableFire", + Info_ValueForKey( info, "g_friendlyBuildableFire" ) ); trap_Cvar_Set( "ui_serverinfo_allowdl", Info_ValueForKey( info, "sv_allowdownload" ) ); } |