X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=ffa8b871b26e18186f0695f9c5fca5b4971c5d15;hb=5d819189d2072487587e0bbba031e1f824e7f9e4;hp=c9ce4e75f10442089054f2dfcc91d5476341de82;hpb=e534789ccef413961784c355d2fbab923614d41d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index c9ce4e75f..ffa8b871b 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -309,6 +309,7 @@ void cvar_changes_init()
 		BADPREFIX("sv_master");
 		BADPREFIX("sv_weaponstats_");
 		BADPREFIX("sv_waypointsprite_");
+		BADCVAR("rescan_pending");
 
 		// these can contain player IDs, so better hide
 		BADPREFIX("g_forced_team_");
@@ -400,6 +401,7 @@ void cvar_changes_init()
 		BADPREFIX("timelimit_");
 		BADCVAR("gameversion");
 		BADPREFIX("gameversion_");
+		BADCVAR("sv_namechangetimer");
 
 		// allowed changes to server admins (please sync this to server.cfg)
 		// vi commands:
@@ -2306,7 +2308,7 @@ float mapvote_maps_suggested[MAPVOTE_COUNT];
 string mapvote_suggestions[MAPVOTE_COUNT];
 float mapvote_suggestion_ptr;
 float mapvote_voters;
-float mapvote_votes[MAPVOTE_COUNT];
+float mapvote_selections[MAPVOTE_COUNT];
 float mapvote_run;
 float mapvote_detail;
 float mapvote_abstain;
@@ -2530,7 +2532,7 @@ float MapVote_SendEntity(entity to, float sf)
 		if(mapvote_detail)
 			for(i = 0; i < mapvote_count; ++i)
 				if(mapvote_maps[i] != "")
-					WriteByte(MSG_ENTITY, mapvote_votes[i]);
+					WriteByte(MSG_ENTITY, mapvote_selections[i]);
 
 		WriteByte(MSG_ENTITY, to.mapvote);
 	}
@@ -2562,16 +2564,16 @@ float MapVote_Finished(float mappos)
 	if(autocvar_sv_eventlog)
 	{
 		result = strcat(":vote:finished:", mapvote_maps[mappos]);
-		result = strcat(result, ":", ftos(mapvote_votes[mappos]), "::");
+		result = strcat(result, ":", ftos(mapvote_selections[mappos]), "::");
 		didntvote = mapvote_voters;
 		for(i = 0; i < mapvote_count; ++i)
 			if(mapvote_maps[i] != "")
 			{
-				didntvote -= mapvote_votes[i];
+				didntvote -= mapvote_selections[i];
 				if(i != mappos)
 				{
 					result = strcat(result, ":", mapvote_maps[i]);
-					result = strcat(result, ":", ftos(mapvote_votes[i]));
+					result = strcat(result, ":", ftos(mapvote_selections[i]));
 				}
 			}
 		result = strcat(result, ":didn't vote:", ftos(didntvote));
@@ -2596,7 +2598,7 @@ void MapVote_CheckRules_1()
 	for(i = 0; i < mapvote_count; ++i) if(mapvote_maps[i] != "")
 	{
 		//dprint("Map ", ftos(i), ": "); dprint(mapvote_maps[i], "\n");
-		mapvote_votes[i] = 0;
+		mapvote_selections[i] = 0;
 	}
 
 	mapvote_voters = 0;
@@ -2607,7 +2609,7 @@ void MapVote_CheckRules_1()
 		{
 			i = other.mapvote - 1;
 			//dprint("Player ", other.netname, " vote = ", ftos(other.mapvote - 1), "\n");
-			mapvote_votes[i] = mapvote_votes[i] + 1;
+			mapvote_selections[i] = mapvote_selections[i] + 1;
 		}
 	}
 }
@@ -2625,11 +2627,11 @@ float MapVote_CheckRules_2()
 
 	mapvote_voters_real = mapvote_voters;
 	if(mapvote_abstain)
-		mapvote_voters_real -= mapvote_votes[mapvote_count - 1];
+		mapvote_voters_real -= mapvote_selections[mapvote_count - 1];
 
 	RandomSelection_Init();
 	for(i = 0; i < mapvote_count_real; ++i) if(mapvote_maps[i] != "")
-		RandomSelection_Add(world, i, string_null, 1, mapvote_votes[i]);
+		RandomSelection_Add(world, i, string_null, 1, mapvote_selections[i]);
 	firstPlace = RandomSelection_chosen_float;
 	firstPlaceVotes = RandomSelection_best_priority;
 	//dprint("First place: ", ftos(firstPlace), "\n");
@@ -2638,7 +2640,7 @@ float MapVote_CheckRules_2()
 	RandomSelection_Init();
 	for(i = 0; i < mapvote_count_real; ++i) if(mapvote_maps[i] != "")
 		if(i != firstPlace)
-			RandomSelection_Add(world, i, string_null, 1, mapvote_votes[i]);
+			RandomSelection_Add(world, i, string_null, 1, mapvote_selections[i]);
 	secondPlace = RandomSelection_chosen_float;
 	secondPlaceVotes = RandomSelection_best_priority;
 	//dprint("Second place: ", ftos(secondPlace), "\n");
@@ -2665,12 +2667,12 @@ float MapVote_CheckRules_2()
 			for(i = 0; i < mapvote_count; ++i)
 				if(mapvote_maps[i] != "")
 				{
-					didntvote -= mapvote_votes[i];
+					didntvote -= mapvote_selections[i];
 					if(i != firstPlace)
 						if(i != secondPlace)
 						{
 							result = strcat(result, ":", mapvote_maps[i]);
-							result = strcat(result, ":", ftos(mapvote_votes[i]));
+							result = strcat(result, ":", ftos(mapvote_selections[i]));
 							if(i < mapvote_count_real)
 							{
 								strunzone(mapvote_maps[i]);