Spectators can vote in TP, not just call a vote

This commit is contained in:
Andrei Drexler 2002-06-02 00:13:39 +00:00
parent 2c6b13be74
commit 148c1b3988
1 changed files with 6 additions and 2 deletions

View File

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.115 2002/06/02 00:13:39 makro
// Spectators can vote in TP, not just call a vote
//
// Revision 1.114 2002/05/31 18:17:10 makro // Revision 1.114 2002/05/31 18:17:10 makro
// Bot stuff. Added a server command that prints a line to a client // Bot stuff. Added a server command that prints a line to a client
// and everyone who is spectating him // and everyone who is spectating him
@ -1742,7 +1745,7 @@ void Cmd_CallVote_f( gentity_t *ent ) {
i = atoi( arg2 ); i = atoi( arg2 );
if (i != GT_FFA && i != GT_TEAM && i != GT_TEAMPLAY) { if (i != GT_FFA && i != GT_TEAM && i != GT_TEAMPLAY) {
trap_SendServerCommand( ent-g_entities, "print \"Invalid gametype.\n\"" ); trap_SendServerCommand( ent-g_entities, "print \"Invalid gametype.\n\"" );
return; return;
} }
Com_sprintf( level.voteString, sizeof( level.voteString ), "%s %d", arg1, i ); Com_sprintf( level.voteString, sizeof( level.voteString ), "%s %d", arg1, i );
@ -1808,7 +1811,8 @@ void Cmd_Vote_f( gentity_t *ent ) {
trap_SendServerCommand( ent-g_entities, "print \"Vote already cast.\n\"" ); trap_SendServerCommand( ent-g_entities, "print \"Vote already cast.\n\"" );
return; return;
} }
if ( ent->client->sess.sessionTeam == TEAM_SPECTATOR ) { //Makro - allow spectators to vote in TP
if ( ent->client->sess.sessionTeam == TEAM_SPECTATOR && g_gametype.integer != GT_TEAMPLAY ) {
trap_SendServerCommand( ent-g_entities, "print \"Not allowed to vote as spectator.\n\"" ); trap_SendServerCommand( ent-g_entities, "print \"Not allowed to vote as spectator.\n\"" );
return; return;
} }