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

Redid the teamcount cvars.

Browse source
This commit is contained in:
Richard Allen 2002-04-30 11:20:12 +00:00
parent 30bddfb909
commit 8abb7358a1
6 changed files with 60 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reaction/cgame/cg_local.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.69 2002/04/30 11:20:12 jbravo
// Redid the teamcount cvars.
//
// Revision 1.68 2002/04/29 06:11:28 niceass // Revision 1.68 2002/04/29 06:11:28 niceass
// centerprint, pressure and matchmode stuff // centerprint, pressure and matchmode stuff
// //
@ -1617,6 +1620,9 @@ extern vmCvar_t cg_RQ3_lca;
extern vmCvar_t cg_RQ3_team_round_going; extern vmCvar_t cg_RQ3_team_round_going;
extern vmCvar_t cg_RQ3_team1name; extern vmCvar_t cg_RQ3_team1name;
extern vmCvar_t cg_RQ3_team2name; extern vmCvar_t cg_RQ3_team2name;
extern vmCvar_t cg_RQ3_teamCount1;
extern vmCvar_t cg_RQ3_teamCount2;
extern vmCvar_t cg_RQ3_numSpectators;
//Slicer: matchmode team status cvars //Slicer: matchmode team status cvars
extern vmCvar_t cg_RQ3_RefID; extern vmCvar_t cg_RQ3_RefID;
extern vmCvar_t cg_RQ3_matchmode; extern vmCvar_t cg_RQ3_matchmode;

9
reaction/cgame/cg_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.59 2002/04/30 11:20:12 jbravo
// Redid the teamcount cvars.
//
// Revision 1.58 2002/04/29 06:12:40 niceass // Revision 1.58 2002/04/29 06:12:40 niceass
// client matchmode stuff // client matchmode stuff
// //
@ -307,6 +310,9 @@ vmCvar_t cg_RQ3_lca;
vmCvar_t cg_RQ3_team_round_going; vmCvar_t cg_RQ3_team_round_going;
vmCvar_t cg_RQ3_team1name; vmCvar_t cg_RQ3_team1name;
vmCvar_t cg_RQ3_team2name; vmCvar_t cg_RQ3_team2name;
vmCvar_t cg_RQ3_teamCount1;
vmCvar_t cg_RQ3_teamCount2;
vmCvar_t cg_RQ3_numSpectators;
//Slicer: matchmode team status cvars //Slicer: matchmode team status cvars
vmCvar_t cg_RQ3_RefID; vmCvar_t cg_RQ3_RefID;
@ -473,6 +479,9 @@ 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", 0}, { &cg_RQ3_team1name, "g_RQ3_team1name", "0", 0},
{ &cg_RQ3_team2name, "g_RQ3_team2name", "0", 0}, { &cg_RQ3_team2name, "g_RQ3_team2name", "0", 0},
{ &cg_RQ3_teamCount1, "cg_RQ3_teamCount1", "0", CVAR_ROM},
{ &cg_RQ3_teamCount2, "cg_RQ3_teamCount2", "0", CVAR_ROM},
{ &cg_RQ3_numSpectators, "cg_RQ3_numSpectators", "0", CVAR_ROM},
{ &cg_gravity, "g_gravity", "0", 0}, { &cg_gravity, "g_gravity", "0", 0},
//Slicer: Team Status Cvars for MM //Slicer: Team Status Cvars for MM
{ &cg_RQ3_matchmode, "g_RQ3_matchmode", "0", 0}, { &cg_RQ3_matchmode, "g_RQ3_matchmode", "0", 0},

23
reaction/cgame/cg_servercmds.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.29 2002/04/30 11:20:12 jbravo
// Redid the teamcount cvars.
//
// Revision 1.28 2002/04/18 16:13:23 jbravo // Revision 1.28 2002/04/18 16:13:23 jbravo
// Scoreboard now shows green for live players and white for dead. // Scoreboard now shows green for live players and white for dead.
// Time should not get reset on deaths any more. // Time should not get reset on deaths any more.
@ -1338,7 +1341,25 @@ static void CG_ServerCommand( void ) {
cg.showScores = qtrue; cg.showScores = qtrue;
cg.scoreTPMode = 0; cg.scoreTPMode = 0;
return; return;
} }
// JBravo: Number of players hack.
if (!strcmp(cmd, "setteamplayers")) {
int team, number;
char teamz[64];
team = atoi(CG_Argv(1));
number = atoi(CG_Argv(2));
Com_sprintf (teamz, sizeof(teamz), "%i", number);
if (team == TEAM_RED)
trap_Cvar_Set("cg_RQ3_teamCount1", teamz);
else if (team == TEAM_BLUE)
trap_Cvar_Set("cg_RQ3_teamCount2", teamz);
else if (team == TEAM_SPECTATOR || team == TEAM_FREE)
trap_Cvar_Set("cg_RQ3_numSpectators", teamz);
return;
}
// JBravo: radio. This implementation rules. Used to suck :) // JBravo: radio. This implementation rules. Used to suck :)
if (!strcmp(cmd, "playradiosound")) { if (!strcmp(cmd, "playradiosound")) {
int sound, gender; int sound, gender;

9
reaction/game/g_local.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.73 2002/04/30 11:20:12 jbravo
// Redid the teamcount cvars.
//
// Revision 1.72 2002/04/29 06:17:20 niceass // Revision 1.72 2002/04/29 06:17:20 niceass
// small change to pressure system // small change to pressure system
// //
@ -1124,9 +1127,9 @@ extern vmCvar_t g_RQ3_team2name; // JBravo: cvar for the name of team 2
extern vmCvar_t g_RQ3_team1model; // JBravo: team 1 model and skin extern vmCvar_t g_RQ3_team1model; // JBravo: team 1 model and skin
extern vmCvar_t g_RQ3_team2model; // JBravo: team 2 model and skin extern vmCvar_t g_RQ3_team2model; // JBravo: team 2 model and skin
extern vmCvar_t g_RQ3_lca; // JBravo: cvar to signal cgame that LCA is in progress extern vmCvar_t g_RQ3_lca; // JBravo: cvar to signal cgame that LCA is in progress
extern vmCvar_t g_RQ3_teamCount1; // JBravo: cvar for the UI join menus //extern vmCvar_t g_RQ3_teamCount1; // JBravo: cvar for the UI join menus
extern vmCvar_t g_RQ3_teamCount2; // JBravo: cvar for the UI join menus //extern vmCvar_t g_RQ3_teamCount2; // JBravo: cvar for the UI join menus
extern vmCvar_t g_RQ3_numSpectators; // JBravo: cvar for the UI join menus //extern vmCvar_t g_RQ3_numSpectators; // JBravo: cvar for the UI join menus
extern vmCvar_t g_RQ3_maxteamkills; // JBravo: Max teamkills extern vmCvar_t g_RQ3_maxteamkills; // JBravo: Max teamkills
extern vmCvar_t g_RQ3_twbanrounds; // JBravo: no. of games team wounders are banned extern vmCvar_t g_RQ3_twbanrounds; // JBravo: no. of games team wounders are banned
extern vmCvar_t g_RQ3_tkbanrounds; // JBravo: no. of games team killers are banned extern vmCvar_t g_RQ3_tkbanrounds; // JBravo: no. of games team killers are banned

15
reaction/game/g_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.50 2002/04/30 11:20:12 jbravo
// Redid the teamcount cvars.
//
// Revision 1.49 2002/04/30 01:23:05 jbravo // Revision 1.49 2002/04/30 01:23:05 jbravo
// Changed the server logging to be more like a normal AQ server. Cleaned // Changed the server logging to be more like a normal AQ server. Cleaned
// all colors from the logs. // all colors from the logs.
@ -212,9 +215,9 @@ vmCvar_t g_RQ3_team1name;
vmCvar_t g_RQ3_team2name; vmCvar_t g_RQ3_team2name;
vmCvar_t g_RQ3_team1model; vmCvar_t g_RQ3_team1model;
vmCvar_t g_RQ3_team2model; vmCvar_t g_RQ3_team2model;
vmCvar_t g_RQ3_teamCount1; //vmCvar_t g_RQ3_teamCount1;
vmCvar_t g_RQ3_teamCount2; //vmCvar_t g_RQ3_teamCount2;
vmCvar_t g_RQ3_numSpectators; //vmCvar_t g_RQ3_numSpectators;
vmCvar_t g_RQ3_maxteamkills; vmCvar_t g_RQ3_maxteamkills;
vmCvar_t g_RQ3_twbanrounds; vmCvar_t g_RQ3_twbanrounds;
vmCvar_t g_RQ3_tkbanrounds; vmCvar_t g_RQ3_tkbanrounds;
@ -360,9 +363,9 @@ static cvarTable_t gameCvarTable[] = {
{ &g_RQ3_team2name, "g_RQ3_team2name", "Swat", CVAR_SYSTEMINFO | CVAR_SERVERINFO , 0, qfalse }, { &g_RQ3_team2name, "g_RQ3_team2name", "Swat", CVAR_SYSTEMINFO | CVAR_SERVERINFO , 0, qfalse },
{ &g_RQ3_team1model, "g_RQ3_team1model", "grunt/robber", CVAR_SERVERINFO, 0, qfalse }, { &g_RQ3_team1model, "g_RQ3_team1model", "grunt/robber", CVAR_SERVERINFO, 0, qfalse },
{ &g_RQ3_team2model, "g_RQ3_team2model", "grunt/police", CVAR_SERVERINFO, 0, qfalse }, { &g_RQ3_team2model, "g_RQ3_team2model", "grunt/police", CVAR_SERVERINFO, 0, qfalse },
{ &g_RQ3_teamCount1, "g_RQ3_teamCount1", "0", CVAR_ROM, 0, qfalse }, // { &g_RQ3_teamCount1, "g_RQ3_teamCount1", "0", CVAR_ROM, 0, qfalse },
{ &g_RQ3_teamCount2, "g_RQ3_teamCount2", "0", CVAR_ROM, 0, qfalse }, // { &g_RQ3_teamCount2, "g_RQ3_teamCount2", "0", CVAR_ROM, 0, qfalse },
{ &g_RQ3_numSpectators, "g_RQ3_numSpectators", "0", CVAR_ROM, 0, qfalse }, // { &g_RQ3_numSpectators, "g_RQ3_numSpectators", "0", CVAR_ROM, 0, qfalse },
{ &g_RQ3_lca, "g_RQ3_lca", "0", CVAR_ROM, 0, qfalse}, { &g_RQ3_lca, "g_RQ3_lca", "0", CVAR_ROM, 0, qfalse},
{ &g_RQ3_maxteamkills, "g_RQ3_maxteamkills", "0", CVAR_ARCHIVE, 0, qtrue}, { &g_RQ3_maxteamkills, "g_RQ3_maxteamkills", "0", CVAR_ARCHIVE, 0, qtrue},
{ &g_RQ3_twbanrounds, "g_RQ3_twbanrounds", "2", CVAR_ARCHIVE, 0, qtrue}, { &g_RQ3_twbanrounds, "g_RQ3_twbanrounds", "2", CVAR_ARCHIVE, 0, qtrue},

11
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.70 2002/04/30 11:20:12 jbravo
// Redid the teamcount cvars.
//
// Revision 1.69 2002/04/30 01:23:05 jbravo // Revision 1.69 2002/04/30 01:23:05 jbravo
// Changed the server logging to be more like a normal AQ server. Cleaned // Changed the server logging to be more like a normal AQ server. Cleaned
// all colors from the logs. // all colors from the logs.
@ -615,7 +618,7 @@ int WonGame(int winner)
team_t RQ3TeamCount( int ignoreClientNum, int team ) team_t RQ3TeamCount( int ignoreClientNum, int team )
{ {
int i, count = 0; int i, count = 0;
char buf[20]; char buf[64];
for (i=0; i<level.maxclients; i++) { for (i=0; i<level.maxclients; i++) {
if (i == ignoreClientNum) { if (i == ignoreClientNum) {
@ -632,14 +635,16 @@ team_t RQ3TeamCount( int ignoreClientNum, int team )
} }
} }
Com_sprintf (buf, sizeof(buf), "%i", count); /* Com_sprintf (buf, sizeof(buf), "%i", count);
if (team == TEAM_RED) if (team == TEAM_RED)
trap_Cvar_Set("g_RQ3_teamCount1", buf); trap_Cvar_Set("g_RQ3_teamCount1", buf);
else if (team == TEAM_BLUE) else if (team == TEAM_BLUE)
trap_Cvar_Set("g_RQ3_teamCount2", buf); trap_Cvar_Set("g_RQ3_teamCount2", buf);
else if (team == TEAM_SPECTATOR || team == TEAM_FREE) else if (team == TEAM_SPECTATOR || team == TEAM_FREE)
trap_Cvar_Set("g_RQ3_numSpectators", buf); trap_Cvar_Set("g_RQ3_numSpectators", buf); */
Com_sprintf (buf, sizeof(buf), "setteamplayers %i %i\n", team, count);
trap_SendServerCommand(-1, buf);
return count; return count;
} }