hifuu-club/illusion-arena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Swap g_altExcellent with g_multiKill

Browse Source
This commit is contained in:
Izuru Yakumo (八雲イズル)
2025-07-15 15:51:59 -03:00
parent 603c2d65e6
commit cf31d9ac2b
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/cgame/cg_servercmds.c
View File

@@ -363,7 +363,7 @@ void CG_ParseServerinfo( void ) {
cgs.roundtime = atoi( Info_ValueForKey( info, "elimination_roundtime" ) ); 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.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.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" ); mapname = Info_ValueForKey( info, "mapname" );
Com_sprintf( cgs.mapname, sizeof( cgs.mapname ), "maps/%s.bsp", mapname ); Com_sprintf( cgs.mapname, sizeof( cgs.mapname ), "maps/%s.bsp", mapname );
Q_strncpyz( cgs.redTeam, Info_ValueForKey( info, "g_redTeam" ), sizeof(cgs.redTeam) ); Q_strncpyz( cgs.redTeam, Info_ValueForKey( info, "g_redTeam" ), sizeof(cgs.redTeam) );

2
code/game/g_combat.c
View File

@@ -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 ) { if ( level.time - attacker->client->lastKillTime < CARNAGE_REWARD_TIME ) {
// KK-OAX // KK-OAX
// Check if Multikills are enabled // Check if Multikills are enabled
if( g_altExcellent.integer ) { if( g_multiKill.integer ) {
attacker->client->pers.multiKillCount++; attacker->client->pers.multiKillCount++;
G_checkForMultiKill( attacker ); G_checkForMultiKill( attacker );
} // play excellent on player } // play excellent on player

10
code/game/g_killspree.c
View File

@@ -77,9 +77,9 @@ qboolean G_ReadAltKillSettings( gentity_t *ent, int skiparg )
// If the config file is not defined...forget reading/loading // If the config file is not defined...forget reading/loading
if( !g_sprees.string[0] ) { if( !g_sprees.string[0] ) {
//Let's disable multikills to keep stock excellent sound //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; return qfalse;
} }
@@ -105,7 +105,7 @@ qboolean G_ReadAltKillSettings( gentity_t *ent, int skiparg )
//If the file can't be accessed/opened. //If the file can't be accessed/opened.
if( length < 0 ) { if( length < 0 ) {
G_Printf( "Could not open configuration file for Sprees and Multikills %s\n", g_sprees.string ); 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; return qfalse;
} }
//Allocate some memory. //Allocate some memory.
@@ -209,8 +209,8 @@ qboolean G_ReadAltKillSettings( gentity_t *ent, int skiparg )
level.mKillUBound = -1; level.mKillUBound = -1;
//KK-OAX We don't have any kills defined, revert to stock. //KK-OAX We don't have any kills defined, revert to stock.
//FIXME: Make sure this change shows up in the console... //FIXME: Make sure this change shows up in the console...
if( g_altExcellent.integer == 1 ) { if( g_multiKill.integer == 1 ) {
trap_Cvar_Set( "g_altExcellent", "0" ); trap_Cvar_Set( "g_multiKill", "0" );
} }
} }

2
code/game/g_local.h
View File

@@ -1125,7 +1125,7 @@ extern vmCvar_t g_lagLightning;
//unlagged - server options //unlagged - server options
//KK-OAX Killing Sprees //KK-OAX Killing Sprees
extern vmCvar_t g_sprees; //Used for specifiying the config file 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 extern vmCvar_t g_spreeDiv; // Interval of a "streak" that form the spree triggers
//KK-OAX Command/Chat Flooding/Spamming //KK-OAX Command/Chat Flooding/Spamming
extern vmCvar_t g_floodMaxDemerits; extern vmCvar_t g_floodMaxDemerits;

4
code/game/g_main.c
View File

@@ -172,7 +172,7 @@ vmCvar_t g_lagLightning; //Adds a little lag to the lightninggun to make
//unlagged - server options //unlagged - server options
//KK-OAX //KK-OAX
vmCvar_t g_sprees; vmCvar_t g_sprees;
vmCvar_t g_altExcellent; vmCvar_t g_multiKill;
vmCvar_t g_spreeDiv; vmCvar_t g_spreeDiv;
//Command/Chat spamming/flooding //Command/Chat spamming/flooding
@@ -372,7 +372,7 @@ static cvarTable_t gameCvarTable[] = {
//KK-OAX //KK-OAX
{ &g_sprees, "g_sprees", "sprees.dat", 0, 0, qfalse }, { &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}, { &g_spreeDiv, "g_spreeDiv", "5", 0, 0, qfalse},
//Used for command/chat flooding //Used for command/chat flooding