Use macros for labels

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mapvoting.qc

diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc
index f59866b29b12bd3c066e28a1b6b5eea5984e38e4..7a615fc863b4015f297d8d72d8e1325937384166 100644 (file)
--- a/qcsrc/server/mapvoting.qc
+++ b/qcsrc/server/mapvoting.qc
@@ -191,7 +191,7 @@ void MapVote_AddVotable(string nextMap, float isSuggestion)
        }
        if(i >= mapvote_screenshot_dirs_count)
                i = 0; // FIXME maybe network this error case, as that means there is no mapshot on the server?
-       for(o = strstr(pakfile, "/", 0)+1; o > 0; o = strstr(pakfile, "/", 0)+1)
+       for(o = strstrofs(pakfile, "/", 0)+1; o > 0; o = strstrofs(pakfile, "/", 0)+1)
                pakfile = substring(pakfile, o, -1);
 
        mapvote_maps_screenshot_dir[mapvote_count] = i;
@@ -482,25 +482,23 @@ float MapVote_Finished(float mappos)
 
 void MapVote_CheckRules_1()
 {
-       int j;
-
-       for(j = 0; i < mapvote_count; ++j)
-               if( mapvote_maps_flags[j] & GTV_AVAILABLE )
+       for (int i = 0; i < mapvote_count; ++i)
+               if (mapvote_maps_flags[i] & GTV_AVAILABLE)
                {
-                       //dprint("Map ", ftos(j), ": "); dprint(mapvote_maps[j], "\n");
-                       mapvote_selections[j] = 0;
+                       //dprint("Map ", ftos(i), ": "); dprint(mapvote_maps[i], "\n");
+                       mapvote_selections[i] = 0;
                }
 
        mapvote_voters = 0;
-       FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA(
+       FOREACH_CLIENT(IS_REAL_CLIENT(it), {
                ++mapvote_voters;
-               if(it.mapvote)
+               if (it.mapvote)
                {
-                       j = it.mapvote - 1;
-                       //dprint("Player ", it.netname, " vote = ", ftos(it.mapvote - 1), "\n");
-                       mapvote_selections[j] = mapvote_selections[j] + 1;
+                       int idx = it.mapvote - 1;
+                       //dprint("Player ", it.netname, " vote = ", ftos(idx), "\n");
+                       ++mapvote_selections[idx];
                }
-       ));
+       });
 }
 
 float MapVote_CheckRules_2()