rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-01-21 00:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some MM fixes and cleanups

Browse source
This commit is contained in:
Richard Allen 2002-05-05 04:23:00 +00:00
parent b13af2ca17
commit f74362d04d
4 changed files with 203 additions and 233 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reaction/game/g_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.75 2002/05/05 04:23:00 jbravo
// Some MM fixes and cleanups
//
// Revision 1.74 2002/05/05 01:20:50 jbravo
// Delay the lights sound 5 server frames.
//
@ -1130,6 +1133,7 @@ extern vmCvar_t g_RQ3_team1name; // JBravo: cvar for the name of team 1
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_team2model; // JBravo: team 2 model and skin
extern vmCvar_t g_RQ3_tpcountdown; // JBravo: to disable the pregame countdown
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_teamCount2; // JBravo: cvar for the UI join menus

5
reaction/game/g_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.52 2002/05/05 04:23:00 jbravo
// Some MM fixes and cleanups
//
// Revision 1.51 2002/05/04 23:17:26 jbravo
// Fixed the model checking code a bit. It now works with the .ini file
//
@ -218,6 +221,7 @@ vmCvar_t g_RQ3_team1name;
vmCvar_t g_RQ3_team2name;
vmCvar_t g_RQ3_team1model;
vmCvar_t g_RQ3_team2model;
vmCvar_t g_RQ3_tpcountdown;
//vmCvar_t g_RQ3_teamCount1;
//vmCvar_t g_RQ3_teamCount2;
//vmCvar_t g_RQ3_numSpectators;
@ -366,6 +370,7 @@ static cvarTable_t gameCvarTable[] = {
{ &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_team2model, "g_RQ3_team2model", "grunt/police", CVAR_SERVERINFO, 0, qfalse },
{ &g_RQ3_tpcountdown, "g_RQ3_tpcountdown", "1", CVAR_ARCHIVE, 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_numSpectators, "g_RQ3_numSpectators", "0", CVAR_ROM, 0, qfalse },

421
reaction/game/g_matchmode.c
View file

@ -2,9 +2,9 @@
// JBravo: for warnings
int ClientNumberFromString(gentity_t *to, char *s);
qboolean checkCaptain(team_t team) {
gentity_t *ent;
int i;
qboolean checkCaptain (team_t team) {
gentity_t *ent;
int i;
for (i = 0; i < level.maxclients; i++) {
ent = &g_entities[i];
if (!ent->inuse)
@ -15,30 +15,30 @@ qboolean checkCaptain(team_t team) {
return qfalse;
}
void MM_RunFrame(void) {
void MM_RunFrame (void) {
int fps;
fps = trap_Cvar_VariableIntegerValue( "sv_fps" );
switch(g_gametype.integer) {
fps = trap_Cvar_VariableIntegerValue ("sv_fps");
switch (g_gametype.integer) {
//Each Type has different ways of dealing things..
case(GT_TEAMPLAY):
if(level.team_game_going && level.inGame)
case (GT_TEAMPLAY):
if (level.team_game_going && level.inGame)
level.matchTime += 1/fps;
break;
}
}
void MM_Sub_f( gentity_t *ent) {
if(!g_RQ3_matchmode.integer)
void MM_Sub_f (gentity_t *ent) {
if (!g_RQ3_matchmode.integer)
return;
if(ent->client->sess.savedTeam == TEAM_SPECTATOR || ent->client->sess.savedTeam == TEAM_FREE ) {
trap_SendServerCommand(ent-g_entities, "print \"You need to be on a team for that\n\"");
if (ent->client->sess.savedTeam == TEAM_SPECTATOR || ent->client->sess.savedTeam == TEAM_FREE) {
trap_SendServerCommand (ent-g_entities, "print \"You need to be on a team for that\n\"");
return;
}
if(ent->client->pers.sub == TEAM_FREE) {
if (ent->client->ps.pm_type == PM_NORMAL) {
if (ent->client->pers.sub == TEAM_FREE) {
// if (ent->client->ps.pm_type == PM_NORMAL) {
if (ent->client->sess.sessionTeam != TEAM_SPECTATOR) {
ent->flags &= ~FL_GODMODE;
ent->client->ps.stats[STAT_HEALTH] = ent->health = 0;
player_die (ent, ent, ent, 100000, MOD_SUICIDE);
@ -46,191 +46,168 @@ void MM_Sub_f( gentity_t *ent) {
ent->client->pers.sub = ent->client->sess.savedTeam;
trap_SendServerCommand( -1, va("print \"%s is now a Substitute for %s.\n\"",
ent->client->pers.netname,
ent->client->sess.savedTeam==TEAM_BLUE ? "Blue Team": "Red Team"));
}
else {
ent->client->sess.savedTeam==TEAM_BLUE ? g_RQ3_team2name.string: g_RQ3_team1name.string));
} else {
ent->client->pers.sub = TEAM_FREE;
trap_SendServerCommand( -1, va("print \"%s is no longer a Substitute for %s.\n\"",
ent->client->pers.netname,
ent->client->sess.savedTeam==TEAM_BLUE ? "Blue Team": "Red Team"));
ent->client->sess.savedTeam==TEAM_BLUE ? g_RQ3_team2name.string: g_RQ3_team1name.string));
}
}
void MM_Captain_f( gentity_t *ent ) {
if(!g_RQ3_matchmode.integer)
void MM_Captain_f (gentity_t *ent) {
if (!g_RQ3_matchmode.integer)
return;
if(ent->client->sess.savedTeam == TEAM_SPECTATOR || ent->client->sess.savedTeam == TEAM_FREE ) {
trap_SendServerCommand(ent-g_entities, "print \"You need to be on a team for that\n\"");
if (ent->client->sess.savedTeam == TEAM_SPECTATOR || ent->client->sess.savedTeam == TEAM_FREE) {
trap_SendServerCommand (ent-g_entities, "print \"You need to be on a team for that\n\"");
return;
}
if(ent->client->pers.captain == TEAM_RED) {
if (ent->client->pers.captain == TEAM_RED) {
trap_Cvar_Set("g_RQ3_team1ready", "0");
trap_SendServerCommand( -1, va("print \"%s is no longer %s's Captain.\n\"",
ent->client->pers.netname,"Red Team"));// Teams will have names in the future..
ent->client->pers.netname, g_RQ3_team1name.string));
ent->client->pers.captain = TEAM_FREE;
}
else if(ent->client->pers.captain == TEAM_BLUE) {
} else if (ent->client->pers.captain == TEAM_BLUE) {
trap_Cvar_Set("g_RQ3_team2ready", "0");
trap_SendServerCommand( -1, va("print \"%s is no longer %s's Captain.\n\"",
ent->client->pers.netname,"Blue Team"));// Teams will have names in the future..
ent->client->pers.netname, g_RQ3_team2name.string));
ent->client->pers.captain = TEAM_FREE;
}
else {
if(!checkCaptain(ent->client->sess.savedTeam)) {
} else {
if (!checkCaptain(ent->client->sess.savedTeam)) {
ent->client->pers.captain = ent->client->sess.savedTeam;
trap_SendServerCommand( -1, va("print \"%s is now %s's Captain.\n\"",
ent->client->pers.netname,
ent->client->sess.savedTeam==TEAM_BLUE ? "Blue Team": "Red Team"));
}
else
ent->client->pers.netname,
ent->client->sess.savedTeam==TEAM_BLUE ? g_RQ3_team2name.string: g_RQ3_team1name.string));
} else
trap_SendServerCommand(ent-g_entities, "print \"Your team already has a Captain\n\"");
}
}
void MM_Ready_f(gentity_t *ent) {
if(!g_RQ3_matchmode.integer)
void MM_Ready_f (gentity_t *ent) {
if (!g_RQ3_matchmode.integer)
return;
if(ent->client->pers.captain != TEAM_FREE) {
if(ent->client->sess.savedTeam == TEAM_RED) {
if (ent->client->pers.captain != TEAM_FREE) {
if (ent->client->sess.savedTeam == TEAM_RED) {
trap_SendServerCommand( -1, va("cp \"%s is%s Ready.\n\"",
"Red Team",g_RQ3_team1ready.integer == 0 ? "": "no longer"));
if(g_RQ3_team1ready.integer)
g_RQ3_team1name.string, g_RQ3_team1ready.integer == 0 ? "": " no longer"));
if (g_RQ3_team1ready.integer)
trap_Cvar_Set("g_RQ3_team1ready", "0");
else
trap_Cvar_Set("g_RQ3_team1ready", "1");
}
else {
} else {
trap_SendServerCommand( -1, va("cp \"%s is%s Ready.\n\"",
"Blue Team",g_RQ3_team2ready.integer == 0 ? "": " no longer"));
g_RQ3_team2name.string, g_RQ3_team2ready.integer == 0 ? "": " no longer"));
if(g_RQ3_team2ready.integer)
trap_Cvar_Set("g_RQ3_team2ready", "0");
if (g_RQ3_team2ready.integer)
trap_Cvar_Set("g_RQ3_team2ready", "0");
else
trap_Cvar_Set("g_RQ3_team2ready", "1");
}
} else
trap_SendServerCommand(ent-g_entities, "print \"You need to be a captain for that\n\"");
}
void MM_TeamModel_f (gentity_t *ent) {
int args;
team_t team;
char buff[MAX_TOKEN_CHARS];
team = ent->client->sess.savedTeam;
if (!g_RQ3_matchmode.integer)
return;
if (team == TEAM_SPECTATOR) {
return;
}
args = trap_Argc();
if (args < 2) {
trap_SendServerCommand(ent-g_entities, va("print \"Your current team model is: %s\n\"",
ent->client->sess.savedTeam == TEAM_RED ? g_RQ3_team1model.string : g_RQ3_team2model.string));
return;
} else {
if (ent->client->pers.captain == TEAM_FREE) {
trap_SendServerCommand(ent-g_entities, "print \"You need to be a captain for that\n\"");
return;
}
if (level.team_game_going || level.team_round_going) {
trap_SendServerCommand(ent-g_entities, "print \"You cannot change your team's model while playing or ready.\n\"");
}
trap_Argv(1, buff, sizeof(buff));
if (team == TEAM_RED) {
if (g_RQ3_team1ready.integer) {
trap_SendServerCommand(ent-g_entities, "print \"You need to un-ready your team for that..\n\"");
return;
}
trap_Cvar_Set("g_RQ3_team1model", buff);
trap_SendServerCommand(-1, va("print \"New Team 1 Model: %s\n\"", buff));
} else {
if (g_RQ3_team2ready.integer) {
trap_SendServerCommand(ent-g_entities, "print \"You need to un-ready your team for that..\n\"");
return;
}
trap_Cvar_Set("g_RQ3_team2model",buff);
trap_SendServerCommand(-1, va("print \"New Team 2 Model: %s\n\"", buff));
}
}
else
trap_SendServerCommand(ent-g_entities, "print \"You need to be a captain for that\n\"");
}
void MM_TeamModel_f(gentity_t *ent) {
int args;
team_t team;
char buff[MAX_TOKEN_CHARS];
team = ent->client->sess.savedTeam;
if(!g_RQ3_matchmode.integer)
return;
if(team == TEAM_SPECTATOR) {
void MM_TeamName_f (gentity_t *ent) {
int args;
team_t team;
char *buff;
team = ent->client->sess.savedTeam;
if (!g_RQ3_matchmode.integer)
return;
if (team == TEAM_SPECTATOR) {
return;
}
args = trap_Argc();
if (args < 2) {
trap_SendServerCommand(ent-g_entities, va("print \"Your Team Name: %s\n\"",
ent->client->sess.savedTeam == TEAM_RED ? g_RQ3_team1name.string : g_RQ3_team2name.string));
return;
} else {
if (ent->client->pers.captain == TEAM_FREE) {
trap_SendServerCommand(ent-g_entities, "print \"You need to be a captain for that\n\"");
return;
}
args = trap_Argc();
if(args < 2) {
trap_SendServerCommand(ent-g_entities, va("print \"Your current team model is: %s\n\"",
ent->client->sess.savedTeam == TEAM_RED ? g_RQ3_team1model.string : g_RQ3_team2model.string ));
return;
if (level.team_game_going || level.team_round_going) {
trap_SendServerCommand(ent-g_entities, "print \"You cannot change your team's name while playing or ready.\n\"");
}
else {
if(ent->client->pers.captain == TEAM_FREE) {
trap_SendServerCommand(ent-g_entities, "print \"You need to be a captain for that\n\"");
buff = ConcatArgs(1);
if (strlen(buff) > TEAM_NAME_SIZE)
buff[TEAM_NAME_SIZE] = 0;
if (team == TEAM_RED) {
if (g_RQ3_team1ready.integer) {
trap_SendServerCommand(ent-g_entities, "print \"You need to un-ready your team for that..\n\"");
return;
}
if(level.team_game_going || level.team_round_going) {
trap_SendServerCommand(ent-g_entities, "print \"You cannot change your team's model while playing or ready.\n\"");
}
trap_Argv(1,buff,sizeof(buff));
if(team == TEAM_RED) {
if(g_RQ3_team1ready.integer) {
trap_SendServerCommand(ent-g_entities, "print \"You need to un-ready your team for that..\n\"");
return;
}
trap_Cvar_Set("g_RQ3_team1model",buff);
trap_SendServerCommand(-1,va("print \"New Team 1 Model: %s\n\"",buff));
}
else {
if(g_RQ3_team2ready.integer) {
trap_SendServerCommand(ent-g_entities, "print \"You need to un-ready your team for that..\n\"");
return;
}
trap_Cvar_Set("g_RQ3_team2model",buff);
trap_SendServerCommand(-1,va("print \"New Team 2 Model: %s\n\"",buff));
}
}
}
void MM_TeamName_f(gentity_t *ent) {
int args;
team_t team;
char *buff;
team = ent->client->sess.savedTeam;
if(!g_RQ3_matchmode.integer)
return;
if(team == TEAM_SPECTATOR) {
return;
}
args = trap_Argc();
if(args < 2) {
trap_SendServerCommand(ent-g_entities, va("print \"Your Team Name: %s\n\"",
ent->client->sess.savedTeam == TEAM_RED ? g_RQ3_team1name.string : g_RQ3_team2name.string ));
return;
}
else {
if(ent->client->pers.captain == TEAM_FREE) {
trap_SendServerCommand(ent-g_entities, "print \"You need to be a captain for that\n\"");
trap_Cvar_Set("g_RQ3_team1name", buff);
trap_SendServerCommand(-1, va("print \"New Team 1 Name: %s\n\"", buff));
} else {
if (g_RQ3_team2ready.integer) {
trap_SendServerCommand(ent-g_entities, "print \"You need to un-ready your team for that..\n\"");
return;
}
if(level.team_game_going || level.team_round_going) {
trap_SendServerCommand(ent-g_entities, "print \"You cannot change your team's name while playing or ready.\n\"");
}
buff = ConcatArgs( 1 );
if( strlen(buff) > TEAM_NAME_SIZE )
buff[TEAM_NAME_SIZE] = 0;
if(team == TEAM_RED) {
if(g_RQ3_team1ready.integer) {
trap_SendServerCommand(ent-g_entities, "print \"You need to un-ready your team for that..\n\"");
return;
}
trap_Cvar_Set("g_RQ3_team1name",buff);
trap_SendServerCommand(-1,va("print \"New Team 1 Name: %s\n\"",buff));
}
else {
if(g_RQ3_team2ready.integer) {
trap_SendServerCommand(ent-g_entities, "print \"You need to un-ready your team for that..\n\"");
return;
}
trap_Cvar_Set("g_RQ3_team2name",buff);
trap_SendServerCommand(-1,va("print \"New Team 2 Name: %s\n\"",buff));
}
}
trap_Cvar_Set("g_RQ3_team2name",buff);
trap_SendServerCommand(-1, va("print \"New Team 2 Name: %s\n\"", buff));
}
}
}
//
// aasimon: Referee Functions Definition, with some aid functions first
//
@ -238,9 +215,10 @@ void MM_TeamName_f(gentity_t *ent) {
// aasimon: perhaps in another place...but lets see
void MM_ClearScores ( void ){
gentity_t *ent;
int i;
void MM_ClearScores (void) {
gentity_t *ent;
int i;
for (i = 0; i < level.maxclients; i++) {
ent = &g_entities[i];
if (!ent->inuse)
@ -250,159 +228,138 @@ void MM_ClearScores ( void ){
ent->client->ps.persistant[PERS_SCORE] = 0;
ent->client->ps.persistant[PERS_KILLED] = 0;
if ( g_gametype.integer == GT_TEAMPLAY ){
if (g_gametype.integer == GT_TEAMPLAY) {
level.teamScores[TEAM_RED] = 0;
level.teamScores[TEAM_BLUE] = 0;
}
}
}
// aasimon: checks for a ref
qboolean Ref_Exists( void ){
qboolean Ref_Exists (void) {
if (g_RQ3_RefID.integer == -1)
return qfalse;
else
return qtrue;
/* gentity_t *ent;
int i;
for (i = 0; i < level.maxclients; i++) {
ent = &g_entities[i];
if (!ent->inuse)
continue;
if(ent->client->pers.referee == qtrue)
return qtrue;
}
return qfalse;
*/
}
}
//
// aasimon: Ref Auth. Do some kind of logging (ip's etc)
//
qboolean Ref_Auth( gentity_t *ent ){
char pass[MAX_TOKEN_CHARS];
int cn;
char teste[2];
qboolean Ref_Auth (gentity_t *ent) {
char pass[MAX_TOKEN_CHARS];
int cn;
char teste[2];
if ( !g_RQ3_AllowRef.integer ){
if (!g_RQ3_AllowRef.integer) {
// No ref allowed on the server - HELLO!!!!! FIREMAN CARS????
trap_SendServerCommand( ent-g_entities, "print \"No Referee Allowed on this server\n\"" );
trap_SendServerCommand(ent-g_entities, "print \"No Referee Allowed on this server\n\"");
return qfalse;
}
if ( Q_stricmp(g_RQ3_RefPass.string, "") == 0){
trap_SendServerCommand( ent-g_entities, "print \"No Referee Password Set on this server\n\"" );
if (Q_stricmp(g_RQ3_RefPass.string, "") == 0) {
trap_SendServerCommand(ent-g_entities, "print \"No Referee Password Set on this server\n\"");
return qfalse;
}
if ( Ref_Exists() ){
if (Ref_Exists()) {
// One ref per match
cn = ent-g_entities;
if ( cn == g_RQ3_RefID.integer){
trap_SendServerCommand ( ent-g_entities, "print \"You are already the referee\n\"" );
if (cn == g_RQ3_RefID.integer) {
trap_SendServerCommand (ent-g_entities, "print \"You are already the referee\n\"");
return qfalse;
}
trap_SendServerCommand( ent-g_entities, "print \"Referee already set on this server\n\"" );
trap_SendServerCommand(ent-g_entities, "print \"Referee already set on this server\n\"");
return qfalse;
}
trap_Argv( 1, pass, sizeof( pass ) );
trap_Argv(1, pass, sizeof(pass));
// Does a simple plain text auth
if ( Q_stricmp (pass, g_RQ3_RefPass.string) == 0) {
if (Q_stricmp (pass, g_RQ3_RefPass.string) == 0) {
cn = ent-g_entities;
Com_sprintf(teste, 3, "%i", cn);
trap_Cvar_Set("g_RQ3_RefID", teste);
trap_SendServerCommand( -1, va("print \"%s" S_COLOR_WHITE " is the new Referee\n\"", ent->client->pers.netname) );
trap_SendServerCommand( -1, va("print \"%s" S_COLOR_WHITE " is the new Referee\n\"", ent->client->pers.netname));
return qtrue;
}
trap_SendServerCommand( ent-g_entities, "print \"Invalid Referee Password\n\"" );
trap_SendServerCommand(ent-g_entities, "print \"Invalid Referee Password\n\"");
return qfalse;
}
//
// aasimon: processes comands sent from the referee
//
void Ref_Command ( gentity_t *ent){
char com[MAX_TOKEN_CHARS];
int cn;
void Ref_Command (gentity_t *ent) {
char com[MAX_TOKEN_CHARS];
int cn;
cn = ent-g_entities;
if (cn != g_RQ3_RefID.integer) {
trap_SendServerCommand( ent-g_entities, "print \"You are not a referee\n\"" );
trap_SendServerCommand(ent-g_entities, "print \"You are not a referee\n\"");
return;
}
trap_Argv ( 1, com, sizeof ( com ) );
trap_Argv (1, com, sizeof (com));
// nice strcmp for each comand (borring, wheres my beer?)
if ( Q_stricmp (com, "help") == 0){
if (Q_stricmp (com, "help") == 0) {
// Theres a clean way to do this - add more help here (this is for example only)
trap_SendServerCommand( ent-g_entities, "print \"kick player\n\"" );
trap_SendServerCommand( ent-g_entities, "print \"map_restart\n\"" );
trap_SendServerCommand( ent-g_entities, "print \"clear_scores\n\"" );
trap_SendServerCommand( ent-g_entities, "print \"pause\n\"" );
trap_SendServerCommand(ent-g_entities, "print \"kick player\n\"");
trap_SendServerCommand(ent-g_entities, "print \"map_restart\n\"");
trap_SendServerCommand(ent-g_entities, "print \"clear_scores\n\"");
trap_SendServerCommand(ent-g_entities, "print \"pause\n\"");
return;
} else if (Q_stricmp (com, "kick") == 0) { // kick kick kick
trap_Argv (2, com, sizeof (com));
if (Q_stricmp (com, "") == 0) {
trap_SendServerCommand(ent-g_entities, "print \"You must name a player. Use: ref kick <player_name>\n\"");
return;
}
} else if ( Q_stricmp (com, "kick") == 0) { // kick kick kick
trap_Argv ( 2, com, sizeof ( com ) );
if ( Q_stricmp (com, "") == 0 ){
trap_SendServerCommand( ent-g_entities, "print \"You must name a player. Use: ref kick <player_name>\n\"" );
cn = ClientNumberFromString (ent, com);
if (cn == -1) {
trap_SendServerCommand( ent-g_entities, va("print \"%s" S_COLOR_WHITE " is not on the server\n\"", com));
return;
}
cn = ClientNumberFromString( ent, com );
if ( cn == -1 ){
trap_SendServerCommand( ent-g_entities, va("print \"%s" S_COLOR_WHITE " is not on the server\n\"", com) );
return;
}
trap_DropClient( cn, "was kicked by the referee" );
} else if( Q_stricmp (com, "clearscores") == 0 ){
trap_DropClient(cn, "was kicked by the referee");
} else if (Q_stricmp (com, "clearscores") == 0 ) {
MM_ClearScores();
return;
} else if (Q_stricmp (com, "map_restart") == 0 ){
} else if (Q_stricmp (com, "map_restart") == 0 ) {
// this is having problems, namely diference from rcon map_restart or using this trap
// Ok here it goes: doing map_restart with players IN THE GAME forces them to specs but
// the scoreboard still shows the players in the team.
// Second thing is: remove the stupid 5-4-3-2-1 if doing map_restart i (with i > 0)
trap_SendConsoleCommand( EXEC_APPEND, "map_restart 0\n" );
trap_SendConsoleCommand(EXEC_APPEND, "map_restart 0\n");
return;
}
else if(Q_stricmp (com, "pause") == 0 ){
if(level.paused) {
else if (Q_stricmp (com, "pause") == 0) {
if (level.paused) {
trap_SendServerCommand( -1, "cp \"Game resumed by Referee.\n\"");
level.paused = qfalse;
}
else {
if(level.team_game_going) {
if(level.inGame)
} else {
if (level.team_game_going) {
if (level.inGame)
trap_SendServerCommand( ent-g_entities, "print \"Game will be paused at the end of the round");
else
trap_SendServerCommand(-1,va("cp \"Game is now paused by the Referee\""));
level.paused = qtrue;
}
else
} else
trap_SendServerCommand( ent-g_entities, "print \"No game is going..");
}
}
else
} else
trap_SendServerCommand( ent-g_entities, "print \"Invalid Referee comand. Type ref help to see a list of available commands\n\"" );
}
void Ref_Resign ( gentity_t *ent ){
void Ref_Resign (gentity_t *ent) {
if (ent-g_entities != g_RQ3_RefID.integer) {
trap_SendServerCommand( ent-g_entities, "print \"You are not a referee\n\"" );
return;

6
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.78 2002/05/05 04:23:00 jbravo
// Some MM fixes and cleanups
//
// Revision 1.77 2002/05/05 01:20:50 jbravo
// Delay the lights sound 5 server frames.
//
@ -334,7 +337,7 @@ void CheckTeamRules()
} else {
if (level.team_round_countdown)
level.team_round_countdown--;
if (level.team_round_countdown == (101*level.fps)/10) {
if (g_RQ3_tpcountdown.integer && level.team_round_countdown == (101*level.fps)/10) {
for (i = 0; i < level.maxclients; i++) {
player = &g_entities[i];
if (!player->inuse)
@ -1384,6 +1387,7 @@ void GetLastKilledTarget (gentity_t * self, char * buf)
} else {
strcat (buf, "^5, ");
strcat (buf, self->client->lastkilled_client[i]->client->pers.netname);
strcat (buf, "^5");
}
}
}