From 2f7b13bd7fc1724a8461d10e5439933b2b451e71 Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 5 Jan 2008 22:15:33 +0000 Subject: [PATCH] handle didn't vote CORRECTLY git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3111 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/g_world.qc | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index 72b76208a..e3ef31456 100644 --- a/data/qcsrc/server/g_world.qc +++ b/data/qcsrc/server/g_world.qc @@ -1797,13 +1797,15 @@ float MapVote_Finished(float mappos) result = strcat(result, ":", ftos(mapvote_votes[mappos]), "::"); didntvote = mapvote_voters; for(i = 0; i < mapvote_count; ++i) - if(i != mappos) - if(mapvote_maps[i] != "") + if(mapvote_maps[i] != "") + { + didntvote -= mapvote_votes[i]; + if(i != mappos) { result = strcat(result, ":", mapvote_maps[i]); result = strcat(result, ":", ftos(mapvote_votes[i])); - didntvote -= mapvote_votes[i]; } + } result = strcat(result, ":didn't vote:", ftos(didntvote)); GameLogEcho(result, FALSE); @@ -1888,11 +1890,11 @@ float MapVote_CheckRules_2() result = strcat(result, ":", ftos(secondPlaceVotes), "::"); didntvote = mapvote_voters; for(i = 0; i < mapvote_count; ++i) - { - didntvote -= mapvote_votes[i]; - if(i != firstPlace) - if(i != secondPlace) - if(mapvote_maps[i] != "") + if(mapvote_maps[i] != "") + { + didntvote -= mapvote_votes[i]; + if(i != firstPlace) + if(i != secondPlace) { result = strcat(result, ":", mapvote_maps[i]); result = strcat(result, ":", ftos(mapvote_votes[i])); @@ -1902,7 +1904,7 @@ float MapVote_CheckRules_2() mapvote_maps[i] = ""; } } - } + } result = strcat(result, ":didn't vote:", ftos(didntvote)); GameLogEcho(result, FALSE); } -- 2.39.2