From 684bf62ad5d0a8486cc1f190874aedb0f2d2f7b7 Mon Sep 17 00:00:00 2001 From: Richard Allen Date: Sun, 18 Mar 2012 02:32:03 +0000 Subject: [PATCH] Defaulting to TTI's new cops and robbers skins for team based games --- reaction/code/cgame/cg_main.c | 4 ++-- reaction/code/game/g_client.c | 12 ++++++------ reaction/code/game/g_main.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/reaction/code/cgame/cg_main.c b/reaction/code/cgame/cg_main.c index 21a470e6..d15f71aa 100644 --- a/reaction/code/cgame/cg_main.c +++ b/reaction/code/cgame/cg_main.c @@ -942,8 +942,8 @@ static cvarTable_t cvarTable[] = { // bk001129 // { &cg_RQ3_team_round_going, "cg_RQ3_team_round_going", "0", CVAR_ROM}, {&cg_RQ3_team1name, "g_RQ3_team1name", "0", CVAR_SYSTEMINFO}, {&cg_RQ3_team2name, "g_RQ3_team2name", "0", CVAR_SYSTEMINFO}, - {&cg_RQ3_team1model, "g_RQ3_team1model", "reactionmale/default", CVAR_SYSTEMINFO}, - {&cg_RQ3_team2model, "g_RQ3_team2model", "reactionmale/robber", CVAR_SYSTEMINFO}, + {&cg_RQ3_team1model, "g_RQ3_team1model", "reactionmale/cops", CVAR_SYSTEMINFO}, + {&cg_RQ3_team2model, "g_RQ3_team2model", "reactionmale/robbers", CVAR_SYSTEMINFO}, {&ui_RQ3_teamCount1, "ui_RQ3_teamCount1", "0", CVAR_ROM}, {&ui_RQ3_teamCount2, "ui_RQ3_teamCount2", "0", CVAR_ROM}, {&ui_RQ3_numSpectators, "ui_RQ3_numSpectators", "0", CVAR_ROM}, diff --git a/reaction/code/game/g_client.c b/reaction/code/game/g_client.c index 927bc09f..3178fde9 100644 --- a/reaction/code/game/g_client.c +++ b/reaction/code/game/g_client.c @@ -1096,14 +1096,14 @@ void ClientUserinfoChanged(int clientNum) if (skin2) { *skin2++ = '\0'; } else { - skin2 = "default"; + skin2 = "cops"; } if (RQ3_Validatemodel(model2) != -1) { Com_sprintf(model, sizeof(model), "%s/%s", model2, skin2); Com_sprintf(headModel, sizeof(headModel), "%s/%s", model2, skin2); } else { - Com_sprintf(model, sizeof(model), "reactionmale/default"); - Com_sprintf(headModel, sizeof(headModel), "reactionmale/default"); + Com_sprintf(model, sizeof(model), "reactionmale/cops"); + Com_sprintf(headModel, sizeof(headModel), "reactionmale/cops"); } } else { Q_strncpyz(model2, g_RQ3_team2model.string, sizeof(model)); @@ -1111,14 +1111,14 @@ void ClientUserinfoChanged(int clientNum) if (skin2) { *skin2++ = '\0'; } else { - skin2 = "robber"; + skin2 = "robbers"; } if (RQ3_Validatemodel(model2) != -1) { Com_sprintf(model, sizeof(model), "%s/%s", model2, skin2); Com_sprintf(headModel, sizeof(headModel), "%s/%s", model2, skin2); } else { - Com_sprintf(model, sizeof(model), "reactionmale/robber"); - Com_sprintf(headModel, sizeof(headModel), "reactionmale/robber"); + Com_sprintf(model, sizeof(model), "reactionmale/robbers"); + Com_sprintf(headModel, sizeof(headModel), "reactionmale/robbers"); } } } else { diff --git a/reaction/code/game/g_main.c b/reaction/code/game/g_main.c index f2d00459..834d07bc 100644 --- a/reaction/code/game/g_main.c +++ b/reaction/code/game/g_main.c @@ -708,8 +708,8 @@ static cvarTable_t gameCvarTable[] = { {&g_RQ3_sniperup, "g_RQ3_sniperup", "0", CVAR_ARCHIVE, 0, qtrue}, {&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_team1model, "g_RQ3_team1model", "reactionmale/cops", CVAR_SYSTEMINFO, 0, qfalse}, + {&g_RQ3_team2model, "g_RQ3_team2model", "reactionmale/robbers", CVAR_SYSTEMINFO, 0, qfalse}, {&g_RQ3_tpcountdown, "g_RQ3_tpcountdown", "1", CVAR_ARCHIVE, 0, qfalse}, {&g_RQ3_showOwnKills, "g_RQ3_showOwnKills", "1", CVAR_ARCHIVE, 0, qfalse}, {&g_RQ3_gib, "g_RQ3_gib", "1", CVAR_ARCHIVE, 0, qtrue},