X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmapvoting.qc;h=409674f0a3a8f437cccacd730a06b0eaa9df51cc;hb=0366770c97e88ade7118695647279773a8548b8f;hp=5a9f7e0765c85e5a66e6d4ada2da8048b02fd597;hpb=21307f327df5609b82d90496c1c6156d636d1c8d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc
index 5a9f7e076..409674f0a 100644
--- a/qcsrc/server/mapvoting.qc
+++ b/qcsrc/server/mapvoting.qc
@@ -99,8 +99,7 @@ string GameTypeVote_MapInfo_FixName(string m)
 
 void MapVote_ClearAllVotes()
 {
-	FOR_EACH_CLIENT(other)
-		other.mapvote = 0;
+	FOREACH_CLIENT(true, LAMBDA(it.mapvote = 0));
 }
 
 void MapVote_UnzoneStrings()
@@ -264,8 +263,7 @@ void MapVote_Init()
 void MapVote_SendPicture(float id)
 {SELFPARAM();
 	msg_entity = self;
-	WriteByte(MSG_ONE, SVC_TEMPENTITY);
-	WriteByte(MSG_ONE, TE_CSQC_PICTURE);
+	WriteHeader(MSG_ONE, TE_CSQC_PICTURE);
 	WriteByte(MSG_ONE, id);
 	WritePicture(MSG_ONE, strcat(mapvote_screenshot_dirs[mapvote_maps_screenshot_dir[id]], "/", mapvote_maps[id]), 3072);
 }
@@ -349,7 +347,7 @@ bool MapVote_SendEntity(entity this, entity to, int sf)
 	if(sf & 1)
 		sf &= ~2; // if we send 1, we don't need to also send 2
 
-	WriteByte(MSG_ENTITY, ENT_CLIENT_MAPVOTE);
+	WriteHeader(MSG_ENTITY, ENT_CLIENT_MAPVOTE);
 	WriteByte(MSG_ENTITY, sf);
 
 	if(sf & 1)
@@ -455,8 +453,7 @@ float MapVote_Finished(float mappos)
 			GameLogEcho(strcat(":vote:suggestion_accepted:", mapvote_maps[mappos]));
 	}
 
-	FOR_EACH_REALCLIENT(other)
-		FixClientCvars(other);
+	FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA(FixClientCvars(it)));
 
 	if(gametypevote)
 	{
@@ -485,26 +482,23 @@ float MapVote_Finished(float mappos)
 
 void MapVote_CheckRules_1()
 {
-	float i;
-
-	for(i = 0; i < mapvote_count; ++i)
-		if( mapvote_maps_flags[i] & GTV_AVAILABLE )
+	for (int i = 0; i < mapvote_count; ++i)
+		if (mapvote_maps_flags[i] & GTV_AVAILABLE)
 		{
 			//dprint("Map ", ftos(i), ": "); dprint(mapvote_maps[i], "\n");
 			mapvote_selections[i] = 0;
 		}
 
 	mapvote_voters = 0;
-	FOR_EACH_REALCLIENT(other)
-	{
+	FOREACH_CLIENT(IS_REAL_CLIENT(it), {
 		++mapvote_voters;
-		if(other.mapvote)
+		if (it.mapvote)
 		{
-			i = other.mapvote - 1;
-			//dprint("Player ", other.netname, " vote = ", ftos(other.mapvote - 1), "\n");
-			mapvote_selections[i] = mapvote_selections[i] + 1;
+			int idx = it.mapvote - 1;
+			//dprint("Player ", it.netname, " vote = ", ftos(idx), "\n");
+			++mapvote_selections[idx];
 		}
-	}
+	});
 }
 
 float MapVote_CheckRules_2()
@@ -605,36 +599,33 @@ void MapVote_Tick()
 		return;
 
 	totalvotes = 0;
-	FOR_EACH_REALCLIENT(other)
-	{
+	FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA(
 		// hide scoreboard again
-		if(other.health != 2342)
+		if(it.health != 2342)
 		{
-			other.health = 2342;
-			other.impulse = 0;
-			if(IS_REAL_CLIENT(other))
-			{
-				msg_entity = other;
-				WriteByte(MSG_ONE, SVC_FINALE);
-				WriteString(MSG_ONE, "");
-			}
+			it.health = 2342;
+			it.impulse = 0;
+
+			msg_entity = it;
+			WriteByte(MSG_ONE, SVC_FINALE);
+			WriteString(MSG_ONE, "");
 		}
 
 		// clear possibly invalid votes
-		if ( !(mapvote_maps_flags[other.mapvote-1] & GTV_AVAILABLE) )
-			other.mapvote = 0;
+		if ( !(mapvote_maps_flags[it.mapvote-1] & GTV_AVAILABLE) )
+			it.mapvote = 0;
 		// use impulses as new vote
-		if(other.impulse >= 1 && other.impulse <= mapvote_count)
-			if( mapvote_maps_flags[other.impulse - 1] & GTV_AVAILABLE )
+		if(it.impulse >= 1 && it.impulse <= mapvote_count)
+			if( mapvote_maps_flags[it.impulse - 1] & GTV_AVAILABLE )
 			{
-				other.mapvote = other.impulse;
-				MapVote_TouchVotes(other);
+				it.mapvote = it.impulse;
+				MapVote_TouchVotes(it);
 			}
-		other.impulse = 0;
+		it.impulse = 0;
 
-		if(other.mapvote)
+		if(it.mapvote)
 			++totalvotes;
-	}
+	));
 
 	MapVote_CheckRules_1(); // just count
 }