rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-13 00:24:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

I had the new skins inverted

Browse source
This commit is contained in:
Richard Allen 2012-03-18 03:09:43 +00:00
parent 684bf62ad5
commit 220e3fd37a
4 changed files with 25 additions and 25 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_team_round_going, "cg_RQ3_team_round_going", "0", CVAR_ROM},
{&cg_RQ3_team1name, "g_RQ3_team1name", "0", CVAR_SYSTEMINFO}, {&cg_RQ3_team1name, "g_RQ3_team1name", "0", CVAR_SYSTEMINFO},
{&cg_RQ3_team2name, "g_RQ3_team2name", "0", CVAR_SYSTEMINFO}, {&cg_RQ3_team2name, "g_RQ3_team2name", "0", CVAR_SYSTEMINFO},
{&cg_RQ3_team1model, "g_RQ3_team1model", "reactionmale/cops", CVAR_SYSTEMINFO}, {&cg_RQ3_team1model, "g_RQ3_team1model", "reactionmale/robbers", CVAR_SYSTEMINFO},
{&cg_RQ3_team2model, "g_RQ3_team2model", "reactionmale/robbers", CVAR_SYSTEMINFO}, {&cg_RQ3_team2model, "g_RQ3_team2model", "reactionmale/cops", CVAR_SYSTEMINFO},
{&ui_RQ3_teamCount1, "ui_RQ3_teamCount1", "0", CVAR_ROM}, {&ui_RQ3_teamCount1, "ui_RQ3_teamCount1", "0", CVAR_ROM},
{&ui_RQ3_teamCount2, "ui_RQ3_teamCount2", "0", CVAR_ROM}, {&ui_RQ3_teamCount2, "ui_RQ3_teamCount2", "0", CVAR_ROM},
{&ui_RQ3_numSpectators, "ui_RQ3_numSpectators", "0", CVAR_ROM}, {&ui_RQ3_numSpectators, "ui_RQ3_numSpectators", "0", CVAR_ROM},

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 ("headmodel", "reactionmale", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("team_model", "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 ("team_headmodel", "*reactionmale", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("g_redTeam", "Cops", CVAR_SERVERINFO | CVAR_ARCHIVE); Cvar_Get ("g_redTeam", "Robbers", CVAR_SERVERINFO | CVAR_ARCHIVE);
Cvar_Get ("g_blueTeam", "Robbers", CVAR_SERVERINFO | CVAR_ARCHIVE); Cvar_Get ("g_blueTeam", "Cops", CVAR_SERVERINFO | CVAR_ARCHIVE);
Cvar_Get ("color1", "4", CVAR_USERINFO | CVAR_ARCHIVE ); Cvar_Get ("color1", "4", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("color2", "5", CVAR_USERINFO | CVAR_ARCHIVE ); Cvar_Get ("color2", "5", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("handicap", "100", CVAR_USERINFO | CVAR_ARCHIVE ); Cvar_Get ("handicap", "100", CVAR_USERINFO | CVAR_ARCHIVE );

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

@ -1093,21 +1093,6 @@ void ClientUserinfoChanged(int clientNum)
if (client->sess.savedTeam == TEAM_RED) { if (client->sess.savedTeam == TEAM_RED) {
Q_strncpyz(model2, g_RQ3_team1model.string, sizeof(model)); Q_strncpyz(model2, g_RQ3_team1model.string, sizeof(model));
skin2 = strrchr(model2, '/'); skin2 = strrchr(model2, '/');
if (skin2) {
*skin2++ = '\0';
} else {
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/cops");
Com_sprintf(headModel, sizeof(headModel), "reactionmale/cops");
}
} else {
Q_strncpyz(model2, g_RQ3_team2model.string, sizeof(model));
skin2 = strrchr(model2, '/');
if (skin2) { if (skin2) {
*skin2++ = '\0'; *skin2++ = '\0';
} else { } else {
@ -1120,6 +1105,21 @@ void ClientUserinfoChanged(int clientNum)
Com_sprintf(model, sizeof(model), "reactionmale/robbers"); Com_sprintf(model, sizeof(model), "reactionmale/robbers");
Com_sprintf(headModel, sizeof(headModel), "reactionmale/robbers"); Com_sprintf(headModel, sizeof(headModel), "reactionmale/robbers");
} }
} else {
Q_strncpyz(model2, g_RQ3_team2model.string, sizeof(model));
skin2 = strrchr(model2, '/');
if (skin2) {
*skin2++ = '\0';
} else {
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/cops");
Com_sprintf(headModel, sizeof(headModel), "reactionmale/cops");
}
} }
} else { } else {
Q_strncpyz(model2, model, sizeof(model)); Q_strncpyz(model2, model, sizeof(model));

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

@ -706,10 +706,10 @@ static cvarTable_t gameCvarTable[] = {
{&g_RQ3_tgren, "g_RQ3_tgren", "0", CVAR_ARCHIVE, 0, qtrue}, {&g_RQ3_tgren, "g_RQ3_tgren", "0", CVAR_ARCHIVE, 0, qtrue},
{&g_RQ3_limchasecam, "g_RQ3_limchasecam", "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_sniperup, "g_RQ3_sniperup", "0", CVAR_ARCHIVE, 0, qtrue},
{&g_RQ3_team1name, "g_RQ3_team1name", "Cops", CVAR_SYSTEMINFO | CVAR_SERVERINFO, 0, qfalse}, {&g_RQ3_team1name, "g_RQ3_team1name", "Robbers", CVAR_SYSTEMINFO | CVAR_SERVERINFO, 0, qfalse},
{&g_RQ3_team2name, "g_RQ3_team2name", "Robbers", CVAR_SYSTEMINFO | CVAR_SERVERINFO, 0, qfalse}, {&g_RQ3_team2name, "g_RQ3_team2name", "Cops", CVAR_SYSTEMINFO | CVAR_SERVERINFO, 0, qfalse},
{&g_RQ3_team1model, "g_RQ3_team1model", "reactionmale/cops", CVAR_SYSTEMINFO, 0, qfalse}, {&g_RQ3_team1model, "g_RQ3_team1model", "reactionmale/robbers", CVAR_SYSTEMINFO, 0, qfalse},
{&g_RQ3_team2model, "g_RQ3_team2model", "reactionmale/robbers", CVAR_SYSTEMINFO, 0, qfalse}, {&g_RQ3_team2model, "g_RQ3_team2model", "reactionmale/cops", CVAR_SYSTEMINFO, 0, qfalse},
{&g_RQ3_tpcountdown, "g_RQ3_tpcountdown", "1", CVAR_ARCHIVE, 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_showOwnKills, "g_RQ3_showOwnKills", "1", CVAR_ARCHIVE, 0, qfalse},
{&g_RQ3_gib, "g_RQ3_gib", "1", CVAR_ARCHIVE, 0, qtrue}, {&g_RQ3_gib, "g_RQ3_gib", "1", CVAR_ARCHIVE, 0, qtrue},
@ -930,9 +930,9 @@ void G_RegisterCvars(void)
trap_Cvar_Set("g_RQ3_team2name", "BLACK"); trap_Cvar_Set("g_RQ3_team2name", "BLACK");
} else { } else {
if (Q_stricmp(g_RQ3_team1name.string, "SILVER") == 0) if (Q_stricmp(g_RQ3_team1name.string, "SILVER") == 0)
trap_Cvar_Set("g_RQ3_team1name", "Cops"); trap_Cvar_Set("g_RQ3_team1name", "Robbers");
if (Q_stricmp(g_RQ3_team2name.string, "BLACK") == 0) if (Q_stricmp(g_RQ3_team2name.string, "BLACK") == 0)
trap_Cvar_Set("g_RQ3_team2name", "Robbers"); trap_Cvar_Set("g_RQ3_team2name", "Cops");
} }
// JBravo: tdmMode now used to control the weapon/item menu in the UI // JBravo: tdmMode now used to control the weapon/item menu in the UI