diff options
| author | kai <kai@zittrig.eu> | 2020-04-27 18:07:55 +0100 |
|---|---|---|
| committer | kai <kai@zittrig.eu> | 2020-04-27 18:27:11 +0100 |
| commit | 063cb53e13516b0ba50890dea4d64e546d2bcde1 (patch) | |
| tree | 4969871cedd7006e1a7db9936919f47bacb881c5 /src/game/g_main.c | |
| parent | a2117f122609669ac14e4ed4fa7b6bca35db15c3 (diff) | |
voting improvements
Diffstat (limited to 'src/game/g_main.c')
| -rw-r--r-- | src/game/g_main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/game/g_main.c b/src/game/g_main.c index 8cdf049..9535288 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -2575,7 +2575,7 @@ void CheckVote( void ) if( voteYesPercent> votePassThreshold || level.voteNo == 0 ) { // execute the command, then remove the vote - trap_SendServerCommand( -1, va("print \"Vote passed (%d - %d)\n\"", + trap_SendServerCommand( -1, va("print \"Vote ^Zpassed ^7(^ZYes: ^7%d | ^ANo: ^7%d)\n\"", level.voteYes, level.voteNo ) ); G_LogPrintf( "Vote: Vote passed (%d-%d)\n", level.voteYes, level.voteNo ); level.voteExecuteTime = level.time + 3000; @@ -2583,7 +2583,7 @@ void CheckVote( void ) else { // same behavior as a timeout - trap_SendServerCommand( -1, va("print \"Vote failed (%d - %d)\n\"", + trap_SendServerCommand( -1, va("print \"Vote ^Afailed ^7(^ZYes: ^7%d | ^ANo: ^7%d)\n\"", level.voteYes, level.voteNo ) ); G_LogPrintf( "Vote: Vote failed (%d - %d)\n", level.voteYes, level.voteNo ); } @@ -2594,7 +2594,7 @@ void CheckVote( void ) ( (double) votePassThreshold/100.0 ) ) ) { // execute the command, then remove the vote - trap_SendServerCommand( -1, va("print \"Vote passed (%d - %d)\n\"", + trap_SendServerCommand( -1, va("print \"Vote ^Zpassed ^7(^ZYes: ^7%d | ^ANo: ^7%d)\n\"", level.voteYes, level.voteNo ) ); G_LogPrintf( "Vote: Vote passed (%d - %d)\n", level.voteYes, level.voteNo ); level.voteExecuteTime = level.time + 3000; @@ -2603,7 +2603,7 @@ void CheckVote( void ) ( (double) ( 100.0-votePassThreshold )/ 100.0 ) ) ) { // same behavior as a timeout - trap_SendServerCommand( -1, va("print \"Vote failed (%d - %d)\n\"", + trap_SendServerCommand( -1, va("print \"Vote ^Afailed ^7(^ZYes: ^7%d | ^ANo: ^7%d)\n\"", level.voteYes, level.voteNo ) ); G_LogPrintf("Vote failed\n"); } @@ -2644,12 +2644,12 @@ void CheckTeamVote( int team ) if( level.teamVoteYes[ cs_offset ] > level.teamVoteNo[ cs_offset ] && level.teamVoteYes[ cs_offset ] >= 2 ) { // execute the command, then remove the vote - trap_SendServerCommand( -1, va("print \"Team vote passed (%d - %d)\n\"", level.teamVoteYes[ cs_offset ], level.teamVoteNo[ cs_offset ] ) ); + trap_SendServerCommand( -1, va("print \"Team vote ^Zpassed ^7(^ZYes: ^7%d | ^ANo: ^7%d)\n\"", level.teamVoteYes[ cs_offset ], level.teamVoteNo[ cs_offset ] ) ); trap_SendConsoleCommand( EXEC_APPEND, va( "%s\n", level.teamVoteString[ cs_offset ] ) ); } else { - trap_SendServerCommand( -1, va("print \"Team vote failed (%d - %d)\n\"", level.teamVoteYes[ cs_offset ], level.teamVoteNo[ cs_offset ] ) ); + trap_SendServerCommand( -1, va("print \"Team vote ^Afailed ^7(^ZYes: ^7%d | ^ANo: ^7%d)\n\"", level.teamVoteYes[ cs_offset ], level.teamVoteNo[ cs_offset ] ) ); G_LogPrintf( "Teamvote: Team vote failed (%d - %d)\n", level.teamVoteYes[ cs_offset ], level.teamVoteNo[ cs_offset ] ); } } @@ -2658,7 +2658,7 @@ void CheckTeamVote( int team ) if( level.teamVoteYes[ cs_offset ] > level.numteamVotingClients[ cs_offset ] / 2 ) { // execute the command, then remove the vote - trap_SendServerCommand( -1, va("print \"Team vote passed (%d - %d)\n\"", level.teamVoteYes[ cs_offset ], level.teamVoteNo[ cs_offset ] ) ); + trap_SendServerCommand( -1, va("print \"Team vote ^Zpassed ^7(^ZYes: ^7%d | ^ANo: ^7%d)\n\"", level.teamVoteYes[ cs_offset ], level.teamVoteNo[ cs_offset ] ) ); G_LogPrintf( "Teamvote: Team vote passed (%d - %d)\n", level.teamVoteYes[ cs_offset ], level.teamVoteNo[ cs_offset ] ); // trap_SendConsoleCommand( EXEC_APPEND, va( "%s\n", level.teamVoteString[ cs_offset ] ) ); @@ -2666,7 +2666,7 @@ void CheckTeamVote( int team ) else if( level.teamVoteNo[ cs_offset ] >= level.numteamVotingClients[ cs_offset ] / 2 ) { // same behavior as a timeout - trap_SendServerCommand( -1, va("print \"Team vote failed (%d - %d)\n\"", level.teamVoteYes[ cs_offset ], level.teamVoteNo[ cs_offset ] ) ); + trap_SendServerCommand( -1, va("print \"Team vote ^Afailed ^7(^ZYes: ^7%d | ^ANo: ^7%d)\n\"", level.teamVoteYes[ cs_offset ], level.teamVoteNo[ cs_offset ] ) ); G_LogPrintf( "Teamvote: Team vote failed (%d - %d)\n", level.teamVoteYes[ cs_offset ], level.teamVoteNo[ cs_offset ] ); } else |