summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_draw.c161
-rw-r--r--src/cgame/cg_drawtools.c25
-rw-r--r--src/cgame/cg_event.c8
-rw-r--r--src/cgame/cg_local.h1
-rw-r--r--src/cgame/cg_main.c33
-rw-r--r--src/cgame/cg_players.c64
-rw-r--r--src/cgame/cg_playerstate.c95
-rw-r--r--src/cgame/cg_predict.c4
-rw-r--r--src/cgame/cg_servercmds.c15
9 files changed, 14 insertions, 392 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 7674df5c..7b77489a 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -2093,9 +2093,9 @@ static void CG_DrawTeamVote( void )
char *s;
int sec, cs_offset;
- if( cgs.clientinfo->team == TEAM_HUMANS )
+ if( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_HUMANS )
cs_offset = 0;
- else if( cgs.clientinfo->team == TEAM_ALIENS )
+ else if( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_ALIENS )
cs_offset = 1;
else
return;
@@ -2176,12 +2176,6 @@ CG_DrawIntermission
*/
static void CG_DrawIntermission( void )
{
- if( cgs.gametype == GT_SINGLE_PLAYER )
- {
- CG_DrawCenterString( );
- return;
- }
-
cg.scoreFadeTime = cg.time;
cg.scoreBoardShowing = CG_DrawScoreboard( );
}
@@ -2247,140 +2241,6 @@ static void CG_DrawAmmoWarning( void )
CG_DrawBigString( 320 - w / 2, 64, s, 1.0F );
}
-/*
-=================
-CG_DrawWarmup
-=================
-*/
-static void CG_DrawWarmup( void )
-{
- int w;
- int sec;
- int i;
- float scale;
- clientInfo_t *ci1, *ci2;
- int cw;
- const char *s;
-
- sec = cg.warmup;
- if( !sec )
- return;
-
- if( sec < 0 )
- {
- s = "Waiting for players";
- w = CG_DrawStrlen( s ) * BIGCHAR_WIDTH;
- CG_DrawBigString( 320 - w / 2, 24, s, 1.0F );
- cg.warmupCount = 0;
- return;
- }
-
- if( cgs.gametype == GT_TOURNAMENT )
- {
- // find the two active players
- ci1 = NULL;
- ci2 = NULL;
-
- for( i = 0 ; i < cgs.maxclients ; i++ )
- {
- if( cgs.clientinfo[ i ].infoValid && cgs.clientinfo[ i ].team == TEAM_FREE )
- {
- if( !ci1 )
- ci1 = &cgs.clientinfo[ i ];
- else
- ci2 = &cgs.clientinfo[ i ];
- }
- }
-
- if( ci1 && ci2 )
- {
- s = va( "%s vs %s", ci1->name, ci2->name );
- w = CG_DrawStrlen( s );
- if( w > 640 / GIANT_WIDTH )
- cw = 640 / w;
- else
- cw = GIANT_WIDTH;
-
- CG_DrawStringExt( 320 - w * cw / 2, 20,s, colorWhite,
- qfalse, qtrue, cw, (int)( cw * 1.5f ), 0 );
- }
- }
- else
- {
- if( cgs.gametype == GT_FFA )
- s = "Free For All";
- else if ( cgs.gametype == GT_TEAM )
- s = "Team Deathmatch";
- else if ( cgs.gametype == GT_CTF )
- s = "Capture the Flag";
- else
- s = "";
-
- w = CG_DrawStrlen( s );
- if( w > 640 / GIANT_WIDTH )
- cw = 640 / w;
- else
- cw = GIANT_WIDTH;
-
- CG_DrawStringExt( 320 - w * cw / 2, 25,s, colorWhite,
- qfalse, qtrue, cw, (int)( cw * 1.1f ), 0 );
- }
-
- sec = ( sec - cg.time ) / 1000;
- if( sec < 0 )
- {
- cg.warmup = 0;
- sec = 0;
- }
-
- s = va( "Starts in: %i", sec + 1 );
-
- if( sec != cg.warmupCount )
- {
- cg.warmupCount = sec;
- switch( sec )
- {
- case 0:
- trap_S_StartLocalSound( cgs.media.count1Sound, CHAN_ANNOUNCER );
- break;
- case 1:
- trap_S_StartLocalSound( cgs.media.count2Sound, CHAN_ANNOUNCER );
- break;
- case 2:
- trap_S_StartLocalSound( cgs.media.count3Sound, CHAN_ANNOUNCER );
- break;
- default:
- break;
- }
- }
-
- scale = 0.45f;
-
- switch( cg.warmupCount )
- {
- case 0:
- cw = 28;
- scale = 0.54f;
- break;
- case 1:
- cw = 24;
- scale = 0.51f;
- break;
- case 2:
- cw = 20;
- scale = 0.48f;
- break;
- default:
- cw = 16;
- scale = 0.45f;
- break;
- }
-
- w = CG_DrawStrlen( s );
- CG_DrawStringExt( 320 - w * cw / 2, 70, s, colorWhite,
- qfalse, qtrue, cw, (int)( cw * 1.5 ), 0 );
-}
-
//==================================================================================
#define SPECTATOR_STRING "SPECTATOR"
@@ -2447,9 +2307,6 @@ static void CG_Draw2D( void )
CG_DrawVote( );
CG_DrawTeamVote( );
- if( !CG_DrawFollow( ) )
- CG_DrawWarmup();
-
// don't draw center string if scoreboard is up
cg.scoreBoardShowing = CG_DrawScoreboard( );
@@ -2458,12 +2315,6 @@ static void CG_Draw2D( void )
}
-static void CG_DrawTourneyScoreboard( )
-{
- CG_DrawOldTourneyScoreboard();
-}
-
-
/*
=====================
CG_DrawActive
@@ -2480,14 +2331,6 @@ void CG_DrawActive( stereoFrame_t stereoView )
if( !cg.snap )
return;
- // optionally draw the tournement scoreboard instead
- if( cg.snap->ps.persistant[ PERS_TEAM ] == TEAM_SPECTATOR &&
- ( cg.snap->ps.pm_flags & PMF_SCOREBOARD ) )
- {
- CG_DrawTourneyScoreboard( );
- return;
- }
-
switch ( stereoView )
{
case STEREO_CENTER:
diff --git a/src/cgame/cg_drawtools.c b/src/cgame/cg_drawtools.c
index 16e90a11..6cc0b74f 100644
--- a/src/cgame/cg_drawtools.c
+++ b/src/cgame/cg_drawtools.c
@@ -426,31 +426,6 @@ float *CG_FadeColor( int startMsec, int totalMsec ) {
/*
-================
-CG_TeamColor
-================
-*/
-float *CG_TeamColor( int team ) {
- static vec4_t red = {1, 0.2f, 0.2f, 1};
- static vec4_t blue = {0.2f, 0.2f, 1, 1};
- static vec4_t other = {1, 1, 1, 1};
- static vec4_t spectator = {0.7f, 0.7f, 0.7f, 1};
-
- switch ( team ) {
- case TEAM_HUMANS:
- return red;
- case TEAM_ALIENS:
- return blue;
- case TEAM_SPECTATOR:
- return spectator;
- default:
- return other;
- }
-}
-
-
-
-/*
=================
CG_GetColorForHealth
=================
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index 2637528b..b8c5e44c 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -196,13 +196,7 @@ static void CG_Obituary( entityState_t *ent ) {
if ( attacker == cg.snap->ps.clientNum ) {
char *s;
- if ( cgs.gametype < GT_TEAM ) {
- s = va("You fragged %s\n%s place with %i", targetName,
- CG_PlaceString( cg.snap->ps.persistant[PERS_RANK] + 1 ),
- cg.snap->ps.persistant[PERS_SCORE] );
- } else {
- s = va("You fragged %s", targetName );
- }
+ s = va("You fragged %s", targetName );
CG_CenterPrint( s, SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH );
// print the text message as well
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index a1ae20bc..e6855a35 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1090,7 +1090,6 @@ typedef struct {
qboolean localServer; // detected on startup by checking sv_running
// parsed from serverinfo
- gametype_t gametype;
int dmflags;
int teamflags;
int fraglimit;
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 29984b33..8d233476 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -565,39 +565,6 @@ static void CG_RegisterSounds( void ) {
cgs.media.alienStageTransition = trap_S_RegisterSound( "sound/announcements/overmindevolved.wav", qtrue );
cgs.media.humanStageTransition = trap_S_RegisterSound( "sound/announcements/reinforcement.wav", qtrue );
- if ( cgs.gametype >= GT_TEAM || cg_buildScript.integer ) {
- cgs.media.captureAwardSound = trap_S_RegisterSound( "sound/teamplay/flagcapture_yourteam.wav", qtrue );
- cgs.media.redLeadsSound = trap_S_RegisterSound( "sound/feedback/redleads.wav", qtrue );
- cgs.media.blueLeadsSound = trap_S_RegisterSound( "sound/feedback/blueleads.wav", qtrue );
- cgs.media.teamsTiedSound = trap_S_RegisterSound( "sound/feedback/teamstied.wav", qtrue );
- cgs.media.hitTeamSound = trap_S_RegisterSound( "sound/feedback/hit_teammate.wav", qtrue );
-
- cgs.media.redScoredSound = trap_S_RegisterSound( "sound/teamplay/voc_red_scores.wav", qtrue );
- cgs.media.blueScoredSound = trap_S_RegisterSound( "sound/teamplay/voc_blue_scores.wav", qtrue );
-
- cgs.media.captureYourTeamSound = trap_S_RegisterSound( "sound/teamplay/flagcapture_yourteam.wav", qtrue );
- cgs.media.captureOpponentSound = trap_S_RegisterSound( "sound/teamplay/flagcapture_opponent.wav", qtrue );
-
- cgs.media.returnYourTeamSound = trap_S_RegisterSound( "sound/teamplay/flagreturn_yourteam.wav", qtrue );
- cgs.media.returnOpponentSound = trap_S_RegisterSound( "sound/teamplay/flagreturn_opponent.wav", qtrue );
-
- cgs.media.takenYourTeamSound = trap_S_RegisterSound( "sound/teamplay/flagtaken_yourteam.wav", qtrue );
- cgs.media.takenOpponentSound = trap_S_RegisterSound( "sound/teamplay/flagtaken_opponent.wav", qtrue );
-
- if ( cgs.gametype == GT_CTF || cg_buildScript.integer ) {
- cgs.media.redFlagReturnedSound = trap_S_RegisterSound( "sound/teamplay/voc_red_returned.wav", qtrue );
- cgs.media.blueFlagReturnedSound = trap_S_RegisterSound( "sound/teamplay/voc_blue_returned.wav", qtrue );
- cgs.media.enemyTookYourFlagSound = trap_S_RegisterSound( "sound/teamplay/voc_enemy_flag.wav", qtrue );
- cgs.media.yourTeamTookEnemyFlagSound = trap_S_RegisterSound( "sound/teamplay/voc_team_flag.wav", qtrue );
- }
-
- cgs.media.youHaveFlagSound = trap_S_RegisterSound( "sound/teamplay/voc_you_flag.wav", qtrue );
- cgs.media.holyShitSound = trap_S_RegisterSound("sound/feedback/voc_holyshit.wav", qtrue);
- cgs.media.neutralFlagReturnedSound = trap_S_RegisterSound( "sound/teamplay/flagreturn_opponent.wav", qtrue );
- cgs.media.yourTeamTookTheFlagSound = trap_S_RegisterSound( "sound/teamplay/voc_team_1flag.wav", qtrue );
- cgs.media.enemyTookTheFlagSound = trap_S_RegisterSound( "sound/teamplay/voc_enemy_1flag.wav", qtrue );
- }
-
cgs.media.tracerSound = trap_S_RegisterSound( "sound/weapons/machinegun/buletby1.wav", qfalse );
cgs.media.selectSound = trap_S_RegisterSound( "sound/weapons/change.wav", qfalse );
cgs.media.wearOffSound = trap_S_RegisterSound( "sound/items/wearoff.wav", qfalse );
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index ee0ce936..09098e31 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -417,22 +417,8 @@ static void CG_LoadClientInfo( clientInfo_t *ci ) {
}
// fall back
- if ( cgs.gametype >= GT_TEAM ) {
-/* // keep skin name
- if( ci->team == TEAM_BLUE ) {
- Q_strncpyz(teamname, DEFAULT_BLUETEAM_NAME, sizeof(teamname) );
- } else {
- Q_strncpyz(teamname, DEFAULT_REDTEAM_NAME, sizeof(teamname) );
- }
- if ( !CG_RegisterClientModelname( ci, DEFAULT_MODEL, ci->skinName ) ) {
- CG_Error( "DEFAULT_MODEL / skin (%s/%s) failed to register",
- DEFAULT_MODEL, ci->skinName );
- }*/
- } else {
- if ( !CG_RegisterClientModelname( ci, DEFAULT_MODEL, "default" ) ) {
- CG_Error( "DEFAULT_MODEL (%s) failed to register", DEFAULT_MODEL );
- }
- }
+ if( !CG_RegisterClientModelname( ci, DEFAULT_MODEL, "default" ) )
+ CG_Error( "DEFAULT_MODEL (%s) failed to register", DEFAULT_MODEL );
}
// sounds
@@ -567,29 +553,6 @@ static void CG_SetDeferredClientInfo( clientInfo_t *ci ) {
int i;
clientInfo_t *match;
- // if we are in teamplay, only grab a model if the skin is correct
- if ( cgs.gametype >= GT_TEAM ) {
- for ( i = 0 ; i < cgs.maxclients ; i++ ) {
- match = &cgs.clientinfo[ i ];
- if ( !match->infoValid ) {
- continue;
- }
- if ( Q_stricmp( ci->skinName, match->skinName ) ) {
- continue;
- }
- ci->deferred = qtrue;
- CG_CopyClientInfoModel( match, ci );
- return;
- }
-
- // load the full model, because we don't ever want to show
- // an improper team skin. This will cause a hitch for the first
- // player, when the second enters. Combat shouldn't be going on
- // yet, so it shouldn't matter
- CG_LoadClientInfo( ci );
- return;
- }
-
// find the first valid clientinfo and grab its stuff
for ( i = 0 ; i < cgs.maxclients ; i++ ) {
match = &cgs.clientinfo[ i ];
@@ -828,7 +791,7 @@ void CG_NewClientInfo( int clientNum ) {
{
// keep whatever they had if it won't violate team skins
if ( ci->infoValid &&
- ( cgs.gametype < GT_TEAM || !Q_stricmp( newInfo.skinName, ci->skinName ) ) )
+ ( !Q_stricmp( newInfo.skinName, ci->skinName ) ) )
{
CG_CopyClientInfoModel( ci, &newInfo );
newInfo.deferred = qtrue;
@@ -1515,28 +1478,19 @@ CG_PlayerSprites
Float sprites over the player's head
===============
*/
-static void CG_PlayerSprites( centity_t *cent ) {
- int team;
-
- if ( cent->currentState.eFlags & EF_CONNECTION ) {
+static void CG_PlayerSprites( centity_t *cent )
+{
+ if( cent->currentState.eFlags & EF_CONNECTION )
+ {
CG_PlayerFloatSprite( cent, cgs.media.connectionShader );
return;
}
- if ( cent->currentState.eFlags & EF_TALK ) {
+ if( cent->currentState.eFlags & EF_TALK )
+ {
CG_PlayerFloatSprite( cent, cgs.media.balloonShader );
return;
}
-
- team = cgs.clientinfo[ cent->currentState.clientNum ].team;
- if ( !(cent->currentState.eFlags & EF_DEAD) &&
- cg.snap->ps.persistant[PERS_TEAM] == team &&
- cgs.gametype >= GT_TEAM) {
- if (cg_drawFriend.integer) {
- CG_PlayerFloatSprite( cent, cgs.media.friendShader );
- }
- return;
- }
}
/*
diff --git a/src/cgame/cg_playerstate.c b/src/cgame/cg_playerstate.c
index e8a94a2e..4a307481 100644
--- a/src/cgame/cg_playerstate.c
+++ b/src/cgame/cg_playerstate.c
@@ -327,84 +327,6 @@ void CG_CheckLocalSounds( playerState_t *ps, playerState_t *ops ) {
// reward sounds
reward = qfalse;
- /*if (ps->persistant[PERS_CAPTURES] != ops->persistant[PERS_CAPTURES]) {
- pushReward(cgs.media.captureAwardSound, cgs.media.medalCapture, ps->persistant[PERS_CAPTURES]);
- reward = qtrue;
- //Com_Printf("capture\n");
- }
- if (ps->persistant[PERS_IMPRESSIVE_COUNT] != ops->persistant[PERS_IMPRESSIVE_COUNT]) {
- sfx = cgs.media.impressiveSound;
- pushReward(sfx, cgs.media.medalImpressive, ps->persistant[PERS_IMPRESSIVE_COUNT]);
- reward = qtrue;
- //Com_Printf("impressive\n");
- }
- if (ps->persistant[PERS_EXCELLENT_COUNT] != ops->persistant[PERS_EXCELLENT_COUNT]) {
- sfx = cgs.media.excellentSound;
- pushReward(sfx, cgs.media.medalExcellent, ps->persistant[PERS_EXCELLENT_COUNT]);
- reward = qtrue;
- //Com_Printf("excellent\n");
- }
- if (ps->persistant[PERS_GAUNTLET_FRAG_COUNT] != ops->persistant[PERS_GAUNTLET_FRAG_COUNT]) {
- sfx = cgs.media.humiliationSound;
- pushReward(sfx, cgs.media.medalGauntlet, ps->persistant[PERS_GAUNTLET_FRAG_COUNT]);
- reward = qtrue;
- //Com_Printf("guantlet frag\n");
- }
- if (ps->persistant[PERS_DEFEND_COUNT] != ops->persistant[PERS_DEFEND_COUNT]) {
- pushReward(cgs.media.defendSound, cgs.media.medalDefend, ps->persistant[PERS_DEFEND_COUNT]);
- reward = qtrue;
- //Com_Printf("defend\n");
- }
- if (ps->persistant[PERS_ASSIST_COUNT] != ops->persistant[PERS_ASSIST_COUNT]) {
- pushReward(cgs.media.assistSound, cgs.media.medalAssist, ps->persistant[PERS_ASSIST_COUNT]);
- reward = qtrue;
- //Com_Printf("assist\n");
- }*/
- // if any of the player event bits changed
- /*if (ps->persistant[PERS_PLAYEREVENTS] != ops->persistant[PERS_PLAYEREVENTS]) {
- if ((ps->persistant[PERS_PLAYEREVENTS] & PLAYEREVENT_DENIEDREWARD) !=
- (ops->persistant[PERS_PLAYEREVENTS] & PLAYEREVENT_DENIEDREWARD)) {
- trap_S_StartLocalSound( cgs.media.deniedSound, CHAN_ANNOUNCER );
- }
- else if ((ps->persistant[PERS_PLAYEREVENTS] & PLAYEREVENT_GAUNTLETREWARD) !=
- (ops->persistant[PERS_PLAYEREVENTS] & PLAYEREVENT_GAUNTLETREWARD)) {
- trap_S_StartLocalSound( cgs.media.humiliationSound, CHAN_ANNOUNCER );
- }
- else if ((ps->persistant[PERS_PLAYEREVENTS] & PLAYEREVENT_HOLYSHIT) !=
- (ops->persistant[PERS_PLAYEREVENTS] & PLAYEREVENT_HOLYSHIT)) {
- trap_S_StartLocalSound( cgs.media.holyShitSound, CHAN_ANNOUNCER );
- }
- reward = qtrue;
- }*/
-
- // check for flag pickup
- /*if ( cgs.gametype >= GT_TEAM ) {
- if ((ps->powerups[PW_REDFLAG] != ops->powerups[PW_REDFLAG] && ps->powerups[PW_REDFLAG]) ||
- (ps->powerups[PW_BLUEFLAG] != ops->powerups[PW_BLUEFLAG] && ps->powerups[PW_BLUEFLAG]) ||
- (ps->powerups[PW_NEUTRALFLAG] != ops->powerups[PW_NEUTRALFLAG] && ps->powerups[PW_NEUTRALFLAG]) )
- {
- trap_S_StartLocalSound( cgs.media.youHaveFlagSound, CHAN_ANNOUNCER );
- }
- }*/
-
- // lead changes
- /*if (!reward) {
- //
- if ( !cg.warmup ) {
- // never play lead changes during warmup
- if ( ps->persistant[PERS_RANK] != ops->persistant[PERS_RANK] ) {
- if ( cgs.gametype < GT_TEAM) {
- if ( ps->persistant[PERS_RANK] == 0 ) {
- CG_AddBufferedSound(cgs.media.takenLeadSound);
- } else if ( ps->persistant[PERS_RANK] == RANK_TIED_FLAG ) {
- CG_AddBufferedSound(cgs.media.tiedLeadSound);
- } else if ( ( ops->persistant[PERS_RANK] & ~RANK_TIED_FLAG ) == 0 ) {
- CG_AddBufferedSound(cgs.media.lostLeadSound);
- }
- }
- }
- }
- }*/
// timelimit warnings
if ( cgs.timelimit > 0 ) {
@@ -424,23 +346,6 @@ void CG_CheckLocalSounds( playerState_t *ps, playerState_t *ops ) {
trap_S_StartLocalSound( cgs.media.fiveMinuteSound, CHAN_ANNOUNCER );
}
}
-
- // fraglimit warnings
- if ( cgs.fraglimit > 0 && cgs.gametype < GT_CTF) {
- highScore = cgs.scores1;
- if ( !( cg.fraglimitWarnings & 4 ) && highScore == (cgs.fraglimit - 1) ) {
- cg.fraglimitWarnings |= 1 | 2 | 4;
- CG_AddBufferedSound(cgs.media.oneFragSound);
- }
- else if ( cgs.fraglimit > 2 && !( cg.fraglimitWarnings & 2 ) && highScore == (cgs.fraglimit - 2) ) {
- cg.fraglimitWarnings |= 1 | 2;
- CG_AddBufferedSound(cgs.media.twoFragSound);
- }
- else if ( cgs.fraglimit > 3 && !( cg.fraglimitWarnings & 1 ) && highScore == (cgs.fraglimit - 3) ) {
- cg.fraglimitWarnings |= 1;
- CG_AddBufferedSound(cgs.media.threeFragSound);
- }
- }
}
diff --git a/src/cgame/cg_predict.c b/src/cgame/cg_predict.c
index 08e22518..d28c9ba6 100644
--- a/src/cgame/cg_predict.c
+++ b/src/cgame/cg_predict.c
@@ -294,10 +294,6 @@ static void CG_TouchItem( centity_t *cent ) {
return;
}
-/* if ( !BG_CanItemBeGrabbed( cgs.gametype, &cent->currentState, &cg.predictedPlayerState ) ) {
- return; // can't hold it
- }*/
-
// grab it
BG_AddPredictableEventToPlayerstate( EV_ITEM_PICKUP, cent->currentState.modelindex , &cg.predictedPlayerState);
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index b676c536..4107cc49 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -115,8 +115,6 @@ void CG_ParseServerinfo( void ) {
char *mapname;
info = CG_ConfigString( CS_SERVERINFO );
- cgs.gametype = atoi( Info_ValueForKey( info, "g_gametype" ) );
- trap_Cvar_Set("g_gametype", va("%i", cgs.gametype));
cgs.dmflags = atoi( Info_ValueForKey( info, "dmflags" ) );
cgs.teamflags = atoi( Info_ValueForKey( info, "teamflags" ) );
cgs.fraglimit = atoi( Info_ValueForKey( info, "fraglimit" ) );
@@ -178,11 +176,6 @@ void CG_SetConfigValues( void )
sscanf( CG_ConfigString( CS_STAGES ), "%d %d", &cgs.alienStage, &cgs.humanStage );
cgs.levelStartTime = atoi( CG_ConfigString( CS_LEVEL_START_TIME ) );
- if( cgs.gametype == GT_CTF ) {
- s = CG_ConfigString( CS_FLAGSTATUS );
- cgs.redflag = s[0] - '0';
- cgs.blueflag = s[1] - '0';
- }
cg.warmup = atoi( CG_ConfigString( CS_WARMUP ) );
}
@@ -342,11 +335,6 @@ static void CG_ConfigStringModified( void ) {
CG_NewClientInfo( num - CS_PLAYERS );
CG_BuildSpectatorString();
} else if ( num == CS_FLAGSTATUS ) {
- if( cgs.gametype == GT_CTF ) {
- // format is rb where its red/blue, 0 is at base, 1 is taken, 2 is dropped
- cgs.redflag = str[0] - '0';
- cgs.blueflag = str[1] - '0';
- }
}
else if ( num == CS_SHADERSTATE ) {
CG_ShaderStateChanged();
@@ -471,7 +459,8 @@ static void CG_MapRestart( void ) {
// we really should clear more parts of cg here and stop sounds
// play the "fight" sound if this is a restart without warmup
- if ( cg.warmup == 0 /* && cgs.gametype == GT_TOURNAMENT */) {
+ if( cg.warmup == 0 )
+ {
trap_S_StartLocalSound( cgs.media.countFightSound, CHAN_ANNOUNCER );
CG_CenterPrint( "FIGHT!", 120, GIANTCHAR_WIDTH*2 );
}
generated by cgit (git 2.34.1) at 2025-01-13 13:49:22 +0000