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

Added playerlist, did some cleanup on votes.

Browse source
This commit is contained in:
Richard Allen 2002-05-12 19:15:47 +00:00
parent 9d5f98865a
commit 644ceaef07
4 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reaction/cgame/cg_consolecmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.49 2002/05/12 19:15:47 jbravo
// Added playerlist, did some cleanup on votes.
//
// Revision 1.48 2002/05/12 16:10:19 jbravo
// Added unignore
//
@ -992,10 +995,11 @@ void CG_InitConsoleCommands( void ) {
trap_AddCommand ("radio_power");
// JBravo: tkok
trap_AddCommand ("tkok");
trap_AddCommand ("playerlist");
// JBravo: ignore
trap_AddCommand ("ignorenum");
trap_AddCommand ("ignore");
trap_AddCommand ("unignore");
trap_AddCommand ("ignorenum");
trap_AddCommand ("clearignorelist");
// Slicer: Matchmode
trap_AddCommand ("captain");

25
reaction/game/g_cmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.110 2002/05/12 19:15:47 jbravo
// Added playerlist, did some cleanup on votes.
//
// Revision 1.109 2002/05/12 16:10:19 jbravo
// Added unignore
//
@ -1705,18 +1708,14 @@ void Cmd_CallVote_f( gentity_t *ent ) {
return;
}
if ( !Q_stricmp( arg1, "map_restart" ) ) {
} else if ( !Q_stricmp( arg1, "nextmap" ) ) {
} else if ( !Q_stricmp( arg1, "map" ) ) {
} else if ( !Q_stricmp( arg1, "g_gametype" ) ) {
} else if ( !Q_stricmp( arg1, "kick" ) ) {
} else if ( !Q_stricmp( arg1, "clientkick" ) ) {
} else if ( !Q_stricmp( arg1, "g_doWarmup" ) ) {
} else if ( !Q_stricmp( arg1, "timelimit" ) ) {
} else if ( !Q_stricmp( arg1, "fraglimit" ) ) {
if (!Q_stricmp(arg1, "nextmap")) {
} else if (!Q_stricmp(arg1, "map")) {
} else if (!Q_stricmp(arg1, "g_gametype")) {
} else if (!Q_stricmp(arg1, "kick")) {
} else if (!Q_stricmp(arg1, "clientkick")) {
} else {
trap_SendServerCommand( ent-g_entities, "print \"Invalid vote string.\n\"" );
trap_SendServerCommand( ent-g_entities, "print \"Vote commands are: map_restart, nextmap, map <mapname>, g_gametype <n>, kick <player>, clientkick <clientnum>, g_doWarmup, timelimit <time>, fraglimit <frags>.\n\"" );
trap_SendServerCommand( ent-g_entities, "print \"Vote commands are: nextmap, map <mapname>, g_gametype <n>, kick <player>, clientkick <clientnum>.\n\"" );
return;
}
@ -1729,10 +1728,10 @@ void Cmd_CallVote_f( gentity_t *ent ) {
// special case for g_gametype, check for bad values
if ( !Q_stricmp( arg1, "g_gametype" ) ) {
i = atoi( arg2 );
if( i == GT_SINGLE_PLAYER || i < GT_FFA || i >= GT_MAX_GAME_TYPE) {
if (i != GT_FFA && i != GT_TEAM && i != GT_TEAMPLAY) {
trap_SendServerCommand( ent-g_entities, "print \"Invalid gametype.\n\"" );
return;
}
}
Com_sprintf( level.voteString, sizeof( level.voteString ), "%s %d", arg1, i );
Com_sprintf( level.voteDisplayString, sizeof( level.voteDisplayString ), "%s %s", arg1, gameNames[i] );
@ -2882,6 +2881,8 @@ void ClientCommand( int clientNum ) {
Cmd_SetViewpos_f( ent );
else if (Q_stricmp (cmd, "stats") == 0)
Cmd_Stats_f( ent );
else if (Q_stricmp (cmd, "playerlist") == 0)
Cmd_Playerlist_f( ent );
//Slicer: matchmode
else if (Q_stricmp (cmd, "captain") == 0)
MM_Captain_f( ent );

15
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.90 2002/05/12 19:15:47 jbravo
// Added playerlist, did some cleanup on votes.
//
// Revision 1.89 2002/05/12 16:10:19 jbravo
// Added unignore
//
@ -2099,3 +2102,15 @@ void Cmd_Ignoreclear_f (gentity_t *self) {
RQ3_ClearIgnoreList (self);
trap_SendServerCommand(self-g_entities, va("print \"Your ignorelist is now clear.\n\""));
}
void Cmd_Playerlist_f (gentity_t *ent) {
gentity_t *other;
int i;
for (i = 0; i <= level.maxclients; i++) {
other = &g_entities[i];
if (!other->inuse || !other->client)
continue;
trap_SendServerCommand(ent-g_entities, va("print \"%i - %s\n\"", i, other->client->pers.netname));
}
}

4
reaction/game/g_teamplay.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.17 2002/05/12 19:15:47 jbravo
// Added playerlist, did some cleanup on votes.
//
// Revision 1.16 2002/05/12 16:10:19 jbravo
// Added unignore
//
@ -101,4 +104,5 @@ void Cmd_Ignore_f(gentity_t *ent);
void Cmd_Unignore_f(gentity_t *ent);
void Cmd_Ignorenum_f(gentity_t *ent);
void Cmd_Ignoreclear_f(gentity_t *ent);
void Cmd_Playerlist_f(gentity_t *ent);
int IsInIgnoreList(gentity_t *source, gentity_t *subject);