rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-17 01:22:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Defaulting to TTI's new cops and robbers skins for team based games

Browse source
This commit is contained in:
Richard Allen 2012-03-18 02:32:03 +00:00
parent 5c358a6353
commit 684bf62ad5
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reaction/code/cgame/cg_main.c
View file

@ -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},

12
reaction/code/game/g_client.c
View file

@ -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 {

4
reaction/code/game/g_main.c
View file

@ -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},