From 87fe3a13202fbcfbd86eacee90248072e796cd54 Mon Sep 17 00:00:00 2001 From: Paradox460 Date: Tue, 29 Jan 2008 22:14:03 +0000 Subject: [PATCH] Added CP for votes, and added percentages to pass/fail messages --- src/game/g_cmds.c | 5 +++++ src/game/g_main.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index a0d741b..8c34d85 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -1706,6 +1706,7 @@ void Cmd_CallVote_f( gentity_t *ent ) trap_SendServerCommand( -1, va( "print \"%s" S_COLOR_WHITE " called a vote: %s\n\"", ent->client->pers.netname, level.voteDisplayString ) ); + trap_SendServerCommand( -1, va( "cp \"A vote has been called\n^2F1: Yes^7, ^1F2: No^7\"" ) ); Q_strcat( level.voteDisplayString, sizeof( level.voteDisplayString ), va( " Called by: %s^7", ent->client->pers.netname ) ); @@ -2081,8 +2082,12 @@ void Cmd_CallTeamVote_f( gentity_t *ent ) continue; if( level.clients[ i ].ps.stats[ STAT_PTEAM ] == team ) + { trap_SendServerCommand( i, va("print \"%s " S_COLOR_WHITE "called a team vote: %s \n\"", ent->client->pers.netname, level.teamVoteDisplayString[ cs_offset ] ) ); + trap_SendServerCommand( i, "cp \"A teamvote has been called\n^2F1: Yes^7, ^1F2: No^7\"" ); + } + } // start the voting diff --git a/src/game/g_main.c b/src/game/g_main.c index f8bf923..0b066a7 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -2308,8 +2308,8 @@ void CheckVote( void ) } } - trap_SendServerCommand(-1, va("print \"Vote %s^7 (^2Y:%d^7-^1N:%d^7) [%s]\n\"", - result, level.voteYes, level.voteNo, level.voteDisplayString ) ); + trap_SendServerCommand(-1, va("print \"Vote %s^7 (^2Y:%d^7-^1N:%d^7, %d percent) (%s)\n\"", + result, level.voteYes, level.voteNo, voteYesPercent, level.voteDisplayString ) ); level.voteTime = 0; trap_SetConfigstring( CS_VOTE_TIME, "" ); @@ -2379,8 +2379,8 @@ void CheckTeamVote( int team ) } } - trap_SendServerCommand( -1, va( "print \"Team vote %s^7 (^2Y:%d^7-^1N:%d^7)\n\"", - result, level.teamVoteYes[ cs_offset ], level.teamVoteNo[ cs_offset ] ) ); + trap_SendServerCommand( -1, va( "print \"Team vote %s^7 (^2Y:%d^7-^1N:%d^7, %d percent)\n\"", + result, level.teamVoteYes[ cs_offset ], level.teamVoteNo[ cs_offset ], voteYesPercent ) ); level.teamVoteTime[ cs_offset ] = 0; trap_SetConfigstring( CS_TEAMVOTE_TIME + cs_offset, "" );