rq3
/
reaction
mirror of https://github.com/ReactionQuake3/reaction.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing team names

This commit is contained in:
Richard Allen 2012-03-17 14:26:06 +00:00
parent 4d69dbb4d9
commit 070b225636
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reaction/code/client/cl_main.c
View File

@ -3559,8 +3559,8 @@ void CL_Init( void ) {
Cvar_Get ("headmodel", "reactionmale", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("team_model", "reactionmale", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("team_headmodel", "*reactionmale", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("g_redTeam", "Stroggs", CVAR_SERVERINFO | CVAR_ARCHIVE);
Cvar_Get ("g_blueTeam", "Pagans", CVAR_SERVERINFO | CVAR_ARCHIVE);
Cvar_Get ("g_redTeam", "Cops", CVAR_SERVERINFO | CVAR_ARCHIVE);
Cvar_Get ("g_blueTeam", "Robbers", CVAR_SERVERINFO | CVAR_ARCHIVE);
Cvar_Get ("color1", "4", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("color2", "5", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("handicap", "100", CVAR_USERINFO | CVAR_ARCHIVE );

8
reaction/code/game/g_main.c
View File

@ -706,8 +706,8 @@ static cvarTable_t gameCvarTable[] = {
{&g_RQ3_tgren, "g_RQ3_tgren", "0", CVAR_ARCHIVE, 0, qtrue},
{&g_RQ3_limchasecam, "g_RQ3_limchasecam", "0", CVAR_ARCHIVE, 0, qtrue},
{&g_RQ3_sniperup, "g_RQ3_sniperup", "0", CVAR_ARCHIVE, 0, qtrue},
{&g_RQ3_team1name, "g_RQ3_team1name", "Team 1", CVAR_SYSTEMINFO | CVAR_SERVERINFO, 0, qfalse},
{&g_RQ3_team2name, "g_RQ3_team2name", "Team 2", CVAR_SYSTEMINFO | CVAR_SERVERINFO, 0, qfalse},
{&g_RQ3_team1name, "g_RQ3_team1name", "Cops", CVAR_SYSTEMINFO | CVAR_SERVERINFO, 0, qfalse},
{&g_RQ3_team2name, "g_RQ3_team2name", "Robbers", CVAR_SYSTEMINFO | CVAR_SERVERINFO, 0, qfalse},
{&g_RQ3_team1model, "g_RQ3_team1model", "reactionmale/default", CVAR_SYSTEMINFO, 0, qfalse},
{&g_RQ3_team2model, "g_RQ3_team2model", "reactionmale/robber", CVAR_SYSTEMINFO, 0, qfalse},
{&g_RQ3_tpcountdown, "g_RQ3_tpcountdown", "1", CVAR_ARCHIVE, 0, qfalse},
@ -930,9 +930,9 @@ void G_RegisterCvars(void)
trap_Cvar_Set("g_RQ3_team2name", "BLACK");
} else {
if (Q_stricmp(g_RQ3_team1name.string, "SILVER") == 0)
trap_Cvar_Set("g_RQ3_team1name", "Team 1");
trap_Cvar_Set("g_RQ3_team1name", "Cops");
if (Q_stricmp(g_RQ3_team2name.string, "BLACK") == 0)
trap_Cvar_Set("g_RQ3_team2name", "Team 2");
trap_Cvar_Set("g_RQ3_team2name", "Robbers");
}
// JBravo: tdmMode now used to control the weapon/item menu in the UI

4
reaction/code/game/g_matchmode.c
View File

@ -249,7 +249,7 @@ void MM_TeamModel_f(gentity_t * ent)
return;
}
trap_Cvar_Set("g_RQ3_team1model", buff);
trap_SendServerCommand(-1, va("print \"New Team 1 Model: "MM_OK_COLOR"%s\n\"", buff));
trap_SendServerCommand(-1, va("print \"New Team %s Model: "MM_OK_COLOR"%s\n\"", g_RQ3_team1name.string, buff));
} else {
if (level.team2ready) {
trap_SendServerCommand(ent - g_entities,
@ -257,7 +257,7 @@ void MM_TeamModel_f(gentity_t * ent)
return;
}
trap_Cvar_Set("g_RQ3_team2model", buff);
trap_SendServerCommand(-1, va("print \"New Team 2 Model: "MM_OK_COLOR"%s\n\"", buff));
trap_SendServerCommand(-1, va("print \"New Team %s Model: "MM_OK_COLOR"%s\n\"", g_RQ3_team2name.string, buff));
}
}
}

8
reaction/code/ui/ui_main.c
View File

@ -9564,10 +9564,10 @@ static cvarTable_t cvarTable[] = {
//{&ui_debug, "ui_debug", "0", CVAR_TEMP},
{&ui_developer, "ui_developer", "0", CVAR_TEMP},
{&ui_initialized, "ui_initialized", "0", CVAR_TEMP},
{&ui_teamName, "ui_teamName", "Pagans", CVAR_ARCHIVE},
{&ui_opponentName, "ui_opponentName", "Stroggs", CVAR_ARCHIVE},
{&ui_redteam, "ui_redteam", "Pagans", CVAR_ARCHIVE},
{&ui_blueteam, "ui_blueteam", "Stroggs", CVAR_ARCHIVE},
{&ui_teamName, "ui_teamName", "Robbers", CVAR_ARCHIVE},
{&ui_opponentName, "ui_opponentName", "Cops", CVAR_ARCHIVE},
{&ui_redteam, "ui_redteam", "Robbers", CVAR_ARCHIVE},
{&ui_blueteam, "ui_blueteam", "Cops", CVAR_ARCHIVE},
{&ui_dedicated, "ui_dedicated", "0", CVAR_ARCHIVE},
{&ui_gameType, "ui_gametype", "3", CVAR_ARCHIVE},
{&ui_joinGameType, "ui_joinGametype", "0", CVAR_ARCHIVE},