X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmapvoting.qc;h=acac831d76a181940782c1b074d7b5e0ef0b3d61;hb=aacbe6fbbfc83dbf63234d28aa21e362077bc6b2;hp=d22073ef6c5d02e25e50263a0ac643c085372aee;hpb=29ba411594428929a9e9a0e0baa620210213bec7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc
index d22073ef6..acac831d7 100644
--- a/qcsrc/server/mapvoting.qc
+++ b/qcsrc/server/mapvoting.qc
@@ -1,5 +1,7 @@
 #include "mapvoting.qh"
 
+#include <server/defs.qh>
+#include <server/miscfunctions.qh>
 #include "g_world.qh"
 #include "command/cmd.qh"
 #include "command/getreplies.qh"
@@ -100,23 +102,15 @@ string GameTypeVote_MapInfo_FixName(string m)
 
 void MapVote_ClearAllVotes()
 {
-	FOREACH_CLIENT(true, LAMBDA(it.mapvote = 0));
+	FOREACH_CLIENT(true, { it.mapvote = 0; });
 }
 
 void MapVote_UnzoneStrings()
 {
 	for(int j = 0; j < mapvote_count; ++j)
 	{
-		if ( mapvote_maps[j] )
-		{
-			strunzone(mapvote_maps[j]);
-			mapvote_maps[j] = string_null;
-		}
-		if ( mapvote_maps_pakfile[j] )
-		{
-			strunzone(mapvote_maps_pakfile[j]);
-			mapvote_maps_pakfile[j] = string_null;
-		}
+		strfree(mapvote_maps[j]);
+		strfree(mapvote_maps_pakfile[j]);
 	}
 }
 
@@ -454,7 +448,7 @@ bool MapVote_Finished(int mappos)
 			GameLogEcho(strcat(":vote:suggestion_accepted:", mapvote_maps[mappos]));
 	}
 
-	FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA(FixClientCvars(it)));
+	FOREACH_CLIENT(IS_REAL_CLIENT(it), { FixClientCvars(it); });
 
 	if(gametypevote)
 	{
@@ -531,7 +525,7 @@ bool MapVote_CheckRules_2()
 			}
 		}
 	firstPlaceVotes = RandomSelection_best_priority;
-	if ( autocvar_sv_vote_gametype_default_current && currentVotes == firstPlaceVotes )
+	if ( autocvar_sv_vote_gametype_default_current && firstPlaceVotes == 0 )
 		firstPlace = currentPlace;
 	else
 		firstPlace = RandomSelection_chosen_float;
@@ -595,11 +589,11 @@ void MapVote_Tick()
 		return;
 
 	int totalvotes = 0;
-	FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA(
+	FOREACH_CLIENT(IS_REAL_CLIENT(it), {
 		// hide scoreboard again
-		if(it.health != 2342)
+		if(GetResource(it, RES_HEALTH) != 2342)
 		{
-			it.health = 2342;
+			SetResourceExplicit(it, RES_HEALTH, 2342);
 			CS(it).impulse = 0;
 
 			msg_entity = it;
@@ -621,7 +615,7 @@ void MapVote_Tick()
 
 		if(it.mapvote)
 			++totalvotes;
-	));
+	});
 
 	MapVote_CheckRules_1(); // just count
 }