From 203c3ac976fcda4a63e543ebd0caa20b9c0c8c84 Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 9 Mar 2009 12:23:05 +0000 Subject: [PATCH] try to fix the "don't care" message spam git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6087 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/client/mapvoting.qc | 6 +++++- data/qcsrc/server/g_world.qc | 28 ++++++++++++++++++---------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/data/qcsrc/client/mapvoting.qc b/data/qcsrc/client/mapvoting.qc index 20d5c20d2..d4ff8968d 100644 --- a/data/qcsrc/client/mapvoting.qc +++ b/data/qcsrc/client/mapvoting.qc @@ -241,7 +241,7 @@ void MapVote_CheckPK3(string pic, string pk3, float id) pak.chain = mv_pk3list; mv_pk3list = pak; - if(pk3 != "" && pk3 != "don't care") // TODO make this less stupid, but I am lazy now + if(pk3 != "") { localcmd(strcat("\ncurl --pak ", pk3, "; wait; cl_cmd mv_download ", ftos(id), "\n")); } @@ -253,6 +253,10 @@ void MapVote_CheckPK3(string pic, string pk3, float id) void MapVote_CheckPic(string pic, string pk3, float id) { + // never try to retrieve a pic for the "don't care" 'map' + if(mv_abstain && id == mv_num_maps - 1) + return; + if(PreviewExists(pic)) { mv_preview[id] = true; diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index 694315943..4bd7516e3 100644 --- a/data/qcsrc/server/g_world.qc +++ b/data/qcsrc/server/g_world.qc @@ -2133,16 +2133,24 @@ float MapVote_SendEntity(entity to, float sf) for(i = 0; i < mapvote_count; ++i) if(mapvote_maps[i] != "") { - WriteString(MSG_ENTITY, mapvote_maps[i]); - mapfile = strcat(mapvote_screenshot_dir, "/", mapvote_maps[i]); - pakfile = whichpack(strcat(mapfile, ".tga")); - if(pakfile == "") - pakfile = whichpack(strcat(mapfile, ".jpg")); - if(pakfile == "") - pakfile = whichpack(strcat(mapfile, ".png")); - for(o = strstr(pakfile, "/", 0)+1; o > 0; o = strstr(pakfile, "/", 0)+1) - pakfile = substring(pakfile, o, 999); - WriteString(MSG_ENTITY, pakfile); + if(mapvote_abstain && i == mapvote_count - 1) + { + WriteString(MSG_ENTITY, ""); // abstain needs no text + WriteString(MSG_ENTITY, ""); // abstain needs no pack + } + else + { + WriteString(MSG_ENTITY, mapvote_maps[i]); + mapfile = strcat(mapvote_screenshot_dir, "/", mapvote_maps[i]); + pakfile = whichpack(strcat(mapfile, ".tga")); + if(pakfile == "") + pakfile = whichpack(strcat(mapfile, ".jpg")); + if(pakfile == "") + pakfile = whichpack(strcat(mapfile, ".png")); + for(o = strstr(pakfile, "/", 0)+1; o > 0; o = strstr(pakfile, "/", 0)+1) + pakfile = substring(pakfile, o, 999); + WriteString(MSG_ENTITY, pakfile); + } } } -- 2.39.2