Merge branch 'master' into Mario/entrap_nade

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

diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc
index a414cd5ff94cff6835291e8f86cc86095cbff40d..b3a496f41e988c1ef19dce7d448e12772daecd0c 100644 (file)
--- a/qcsrc/server/mapvoting.qc
+++ b/qcsrc/server/mapvoting.qc
@@ -120,8 +120,8 @@ void MapVote_UnzoneStrings()
        }
 }
 
-string MapVote_Suggest(string m)
-{SELFPARAM();
+string MapVote_Suggest(entity this, string m)
+{
        float i;
        if(m == "")
                return "That's not how to use this command.";
@@ -156,7 +156,7 @@ string MapVote_Suggest(string m)
                strunzone(mapvote_suggestions[i]);
        mapvote_suggestions[i] = strzone(m);
        if(autocvar_sv_eventlog)
-               GameLogEcho(strcat(":vote:suggested:", m, ":", ftos(self.playerid)));
+               GameLogEcho(strcat(":vote:suggested:", m, ":", ftos(this.playerid)));
        return strcat("Suggestion of ", m, " accepted.");
 }
 
@@ -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;
@@ -260,9 +260,9 @@ void MapVote_Init()
        MapVote_Spawn();
 }
 
-void MapVote_SendPicture(float id)
-{SELFPARAM();
-       msg_entity = self;
+void MapVote_SendPicture(entity to, int id)
+{
+       msg_entity = to;
        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);
@@ -482,25 +482,23 @@ float MapVote_Finished(float mappos)
 
 void MapVote_CheckRules_1()
 {
-       int j;
-
-       for(j = 0; j < 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()
@@ -524,7 +522,7 @@ float MapVote_CheckRules_2()
        for(i = 0; i < mapvote_count_real; ++i)
                if ( mapvote_maps_flags[i] & GTV_AVAILABLE )
                {
-                       RandomSelection_Add(world, i, string_null, 1, mapvote_selections[i]);
+                       RandomSelection_Add(NULL, i, string_null, 1, mapvote_selections[i]);
                        if ( gametypevote &&  mapvote_maps[i] == MapInfo_Type_ToString(MapInfo_CurrentGametype()) )
                        {
                                currentVotes = mapvote_selections[i];
@@ -544,7 +542,7 @@ float MapVote_CheckRules_2()
        for(i = 0; i < mapvote_count_real; ++i)
                if(i != firstPlace)
                if ( mapvote_maps_flags[i] & GTV_AVAILABLE )
-                       RandomSelection_Add(world, i, string_null, 1, mapvote_selections[i]);
+                       RandomSelection_Add(NULL, i, string_null, 1, mapvote_selections[i]);
        secondPlace = RandomSelection_chosen_float;
        secondPlaceVotes = RandomSelection_best_priority;
        //dprint("Second place: ", ftos(secondPlace), "\n");