X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmapvoting.qc;h=9242a5b6f4d057aa99e95f356cf80098eb2f6a12;hb=92d8ff71c2c9f1852b3d4d76546f29877d8f621e;hp=209ac7af98085daf7bdffed0fc335eacba721141;hpb=ecd018b0f2a99be972759503e3efea35b6717ee9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc
index 209ac7af9..9242a5b6f 100644
--- a/qcsrc/server/mapvoting.qc
+++ b/qcsrc/server/mapvoting.qc
@@ -1,17 +1,19 @@
 #include "mapvoting.qh"
 
-#include <server/defs.qh>
-#include <server/miscfunctions.qh>
-#include "g_world.qh"
-#include "command/cmd.qh"
-#include "command/getreplies.qh"
-#include "../common/constants.qh"
+#include <common/constants.qh>
+#include <common/mapinfo.qh>
 #include <common/net_linked.qh>
-#include "../common/mapinfo.qh"
-#include "../common/playerstats.qh"
+#include <common/playerstats.qh>
 #include <common/state.qh>
-#include "../common/util.qh"
-
+#include <common/stats.qh>
+#include <common/util.qh>
+#include <common/weapons/_all.qh>
+#include <server/client.qh>
+#include <server/command/cmd.qh>
+#include <server/command/getreplies.qh>
+#include <server/gamelog.qh>
+#include <server/intermission.qh>
+#include <server/world.qh>
 
 // definitions
 
@@ -46,10 +48,10 @@ entity mapvote_ent;
  */
 Gametype GameTypeVote_Type_FromString(string type_name)
 {
-	Gametype type = MapInfo_Type_FromString(type_name);
+	Gametype type = MapInfo_Type_FromString(type_name, false);
 	if (type == NULL)
 		type = MapInfo_Type_FromString(cvar_string(
-			strcat("sv_vote_gametype_",type_name,"_type")));
+			strcat("sv_vote_gametype_",type_name,"_type")), false);
 	return type;
 }
 
@@ -57,11 +59,11 @@ int GameTypeVote_AvailabilityStatus(string type_name)
 {
 	int flag = GTV_FORBIDDEN;
 
-	Gametype type = MapInfo_Type_FromString(type_name);
+	Gametype type = MapInfo_Type_FromString(type_name, false);
 	if ( type == NULL )
 	{
 		type = MapInfo_Type_FromString(cvar_string(
-			strcat("sv_vote_gametype_",type_name,"_type")));
+			strcat("sv_vote_gametype_",type_name,"_type")), false);
 		flag |= GTV_CUSTOM;
 	}
 
@@ -109,16 +111,8 @@ void MapVote_UnzoneStrings()
 {
 	for(int j = 0; j < mapvote_count; ++j)
 	{
-		if ( mapvote_maps[j] )
-		{
-			strunzone(mapvote_maps[j]);
-			mapvote_maps[j] = string_null;
-		}
-		if ( mapvote_maps_pakfile[j] )
-		{
-			strunzone(mapvote_maps_pakfile[j]);
-			mapvote_maps_pakfile[j] = string_null;
-		}
+		strfree(mapvote_maps[j]);
+		strfree(mapvote_maps_pakfile[j]);
 	}
 }
 
@@ -412,7 +406,7 @@ bool MapVote_SendEntity(entity this, entity to, int sf)
 
 void MapVote_Spawn()
 {
-	Net_LinkEntity(mapvote_ent = spawn(), false, 0, MapVote_SendEntity);
+	Net_LinkEntity(mapvote_ent = new(mapvote_ent), false, 0, MapVote_SendEntity);
 }
 
 void MapVote_TouchMask()
@@ -533,7 +527,7 @@ bool MapVote_CheckRules_2()
 			}
 		}
 	firstPlaceVotes = RandomSelection_best_priority;
-	if ( autocvar_sv_vote_gametype_default_current && currentVotes == firstPlaceVotes )
+	if ( autocvar_sv_vote_gametype_default_current && firstPlaceVotes == 0 )
 		firstPlace = currentPlace;
 	else
 		firstPlace = RandomSelection_chosen_float;
@@ -597,11 +591,18 @@ void MapVote_Tick()
 		return;
 
 	int totalvotes = 0;
-	FOREACH_CLIENT(IS_REAL_CLIENT(it), {
+	FOREACH_CLIENT(true, {
+		if(!IS_REAL_CLIENT(it))
+		{
+			// apply the same special health value to bots too for consistency's sake
+			if(GetResource(it, RES_HEALTH) != 2342)
+				SetResourceExplicit(it, RES_HEALTH, 2342);
+			continue;
+		}
 		// hide scoreboard again
-		if(it.health != 2342)
+		if(GetResource(it, RES_HEALTH) != 2342)
 		{
-			it.health = 2342;
+			SetResourceExplicit(it, RES_HEALTH, 2342); // health in the voting phase
 			CS(it).impulse = 0;
 
 			msg_entity = it;
@@ -734,14 +735,14 @@ bool GameTypeVote_Finished(int pos)
 	if(!gametypevote || gametypevote_finished)
 		return false;
 
+	localcmd("sv_vote_gametype_hook_all\n");
+	localcmd("sv_vote_gametype_hook_", mapvote_maps[pos], "\n");
+
 	if ( !GameTypeVote_SetGametype(GameTypeVote_Type_FromString(mapvote_maps[pos])) )
 	{
 		LOG_TRACE("Selected gametype is not supported by any map");
 	}
 
-	localcmd("sv_vote_gametype_hook_all\n");
-	localcmd("sv_vote_gametype_hook_", mapvote_maps[pos], "\n");
-
 	gametypevote_finished = true;
 
 	return true;