diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c index 7295d9a..7b644ec 100644 --- a/code/cgame/cg_servercmds.c +++ b/code/cgame/cg_servercmds.c @@ -363,7 +363,7 @@ void CG_ParseServerinfo( void ) { cgs.roundtime = atoi( Info_ValueForKey( info, "elimination_roundtime" ) ); cgs.nopickup = atoi( Info_ValueForKey( info, "g_rockets" ) ) + atoi( Info_ValueForKey( info, "g_instantgib" ) ) + atoi( Info_ValueForKey( info, "g_elimination" ) ); cgs.lms_mode = atoi( Info_ValueForKey( info, "g_lms_mode" ) ); - cgs.altExcellent = atoi( Info_ValueForKey( info, "g_altExcellent" ) ); + cgs.altExcellent = atoi( Info_ValueForKey( info, "g_multiKill" ) ); mapname = Info_ValueForKey( info, "mapname" ); Com_sprintf( cgs.mapname, sizeof( cgs.mapname ), "maps/%s.bsp", mapname ); Q_strncpyz( cgs.redTeam, Info_ValueForKey( info, "g_redTeam" ), sizeof(cgs.redTeam) ); diff --git a/code/game/g_combat.c b/code/game/g_combat.c index 8c61944..9749e9a 100644 --- a/code/game/g_combat.c +++ b/code/game/g_combat.c @@ -705,7 +705,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int if ( level.time - attacker->client->lastKillTime < CARNAGE_REWARD_TIME ) { // KK-OAX // Check if Multikills are enabled - if( g_altExcellent.integer ) { + if( g_multiKill.integer ) { attacker->client->pers.multiKillCount++; G_checkForMultiKill( attacker ); } // play excellent on player diff --git a/code/game/g_killspree.c b/code/game/g_killspree.c index 9a13303..bad8148 100644 --- a/code/game/g_killspree.c +++ b/code/game/g_killspree.c @@ -77,9 +77,9 @@ qboolean G_ReadAltKillSettings( gentity_t *ent, int skiparg ) // If the config file is not defined...forget reading/loading if( !g_sprees.string[0] ) { //Let's disable multikills to keep stock excellent sound - if( g_altExcellent.integer == 1 ) + if( g_multiKill.integer == 1 ) { - trap_Cvar_Set( "g_altExcellent", "0" ); + trap_Cvar_Set( "g_multiKill", "0" ); } return qfalse; } @@ -105,7 +105,7 @@ qboolean G_ReadAltKillSettings( gentity_t *ent, int skiparg ) //If the file can't be accessed/opened. if( length < 0 ) { G_Printf( "Could not open configuration file for Sprees and Multikills %s\n", g_sprees.string ); - trap_Cvar_Set( "g_altExcellent", "0" ); + trap_Cvar_Set( "g_multiKill", "0" ); return qfalse; } //Allocate some memory. @@ -209,8 +209,8 @@ qboolean G_ReadAltKillSettings( gentity_t *ent, int skiparg ) level.mKillUBound = -1; //KK-OAX We don't have any kills defined, revert to stock. //FIXME: Make sure this change shows up in the console... - if( g_altExcellent.integer == 1 ) { - trap_Cvar_Set( "g_altExcellent", "0" ); + if( g_multiKill.integer == 1 ) { + trap_Cvar_Set( "g_multiKill", "0" ); } } diff --git a/code/game/g_local.h b/code/game/g_local.h index 4b82323..a15e6e7 100644 --- a/code/game/g_local.h +++ b/code/game/g_local.h @@ -1125,7 +1125,7 @@ extern vmCvar_t g_lagLightning; //unlagged - server options //KK-OAX Killing Sprees extern vmCvar_t g_sprees; //Used for specifiying the config file -extern vmCvar_t g_altExcellent; //Turns on Multikills instead of Excellent +extern vmCvar_t g_multiKill; //Turns on Multikills instead of Excellent extern vmCvar_t g_spreeDiv; // Interval of a "streak" that form the spree triggers //KK-OAX Command/Chat Flooding/Spamming extern vmCvar_t g_floodMaxDemerits; diff --git a/code/game/g_main.c b/code/game/g_main.c index 48baac7..a6fb5ab 100644 --- a/code/game/g_main.c +++ b/code/game/g_main.c @@ -172,7 +172,7 @@ vmCvar_t g_lagLightning; //Adds a little lag to the lightninggun to make //unlagged - server options //KK-OAX vmCvar_t g_sprees; -vmCvar_t g_altExcellent; +vmCvar_t g_multiKill; vmCvar_t g_spreeDiv; //Command/Chat spamming/flooding @@ -372,7 +372,7 @@ static cvarTable_t gameCvarTable[] = { //KK-OAX { &g_sprees, "g_sprees", "sprees.dat", 0, 0, qfalse }, - { &g_altExcellent, "g_altExcellent", "0", CVAR_SERVERINFO, 0, qtrue}, + { &g_multiKill, "g_multiKill", "0", CVAR_SERVERINFO, 0, qtrue}, { &g_spreeDiv, "g_spreeDiv", "5", 0, 0, qfalse}, //Used for command/chat flooding