From 452ca340cd47c17571257f0661a590e3237967f9 Mon Sep 17 00:00:00 2001 From: fruitiex Date: Sun, 17 Jan 2010 11:34:50 +0000 Subject: [PATCH] revert the mapvote change, it didnt really work online. git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8511 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/client/mapvoting.qc | 4 ++-- data/qcsrc/server/g_world.qc | 19 ++----------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/data/qcsrc/client/mapvoting.qc b/data/qcsrc/client/mapvoting.qc index ef127c094..4cb824ad7 100644 --- a/data/qcsrc/client/mapvoting.qc +++ b/data/qcsrc/client/mapvoting.qc @@ -287,6 +287,8 @@ void MapVote_Init() mv_active = 1; + ssdir = ReadString(); + mv_num_maps = min(MAPVOTE_COUNT, ReadByte()); mv_abstain = ReadByte(); if(mv_abstain) @@ -311,9 +313,7 @@ void MapVote_Init() if(mv_maps_mask & power) { map = strzone(ReadString()); - ssdir = ReadString(); pk3 = strzone(ReadString()); - mv_maps[i] = map; mv_pk3[i] = pk3; map = strzone(strcat(ssdir, "/", map)); diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index c0f36ce48..e05fb6cb7 100644 --- a/data/qcsrc/server/g_world.qc +++ b/data/qcsrc/server/g_world.qc @@ -2074,7 +2074,6 @@ float mapvote_keeptwotime; float mapvote_timeout; string mapvote_message; string mapvote_screenshot_dir; -string mapvote_screenshot_dir2; float mapvote_count; float mapvote_count_real; @@ -2202,11 +2201,6 @@ void MapVote_Init() mapvote_screenshot_dir = "maps"; mapvote_screenshot_dir = strzone(mapvote_screenshot_dir); - mapvote_screenshot_dir2 = cvar_string("g_maplist_votable_screenshot_dir2"); - if(mapvote_screenshot_dir2 == "") - mapvote_screenshot_dir2 = "levelshots"; - mapvote_screenshot_dir2 = strzone(mapvote_screenshot_dir2); - MapVote_Spawn(); } @@ -2246,7 +2240,7 @@ float MapVote_GetMapMask() entity mapvote_ent; float MapVote_SendEntity(entity to, float sf) { - string mapfile, mapfile2, pakfile; + string mapfile, pakfile; float i, o; if(sf & 1) @@ -2258,6 +2252,7 @@ float MapVote_SendEntity(entity to, float sf) if(sf & 1) { // flag 1 == initialization + WriteString(MSG_ENTITY, mapvote_screenshot_dir); WriteByte(MSG_ENTITY, mapvote_count); WriteByte(MSG_ENTITY, mapvote_abstain); WriteByte(MSG_ENTITY, mapvote_detail); @@ -2278,23 +2273,13 @@ float MapVote_SendEntity(entity to, float sf) { WriteString(MSG_ENTITY, mapvote_maps[i]); mapfile = strcat(mapvote_screenshot_dir, "/", mapvote_maps[i]); - mapfile2 = strcat(mapvote_screenshot_dir2, "/", mapvote_maps[i]); pakfile = whichpack(strcat(mapfile, ".tga")); if(pakfile == "") pakfile = whichpack(strcat(mapfile, ".jpg")); if(pakfile == "") pakfile = whichpack(strcat(mapfile, ".png")); - if(pakfile == "") { - mapvote_screenshot_dir = mapvote_screenshot_dir2; - pakfile = whichpack(strcat(mapfile2, ".tga")); - } - if(pakfile == "") - pakfile = whichpack(strcat(mapfile2, ".jpg")); - if(pakfile == "") - pakfile = whichpack(strcat(mapfile2, ".png")); for(o = strstr(pakfile, "/", 0)+1; o > 0; o = strstr(pakfile, "/", 0)+1) pakfile = substring(pakfile, o, 999); - WriteString(MSG_ENTITY, mapvote_screenshot_dir); WriteString(MSG_ENTITY, pakfile); } } -- 2.39.2