X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=63f2db883298b7071bd86532e4684899c5e1d9b1;hb=b800544899fb0c516022ab01b21b94ef6db84ab1;hp=08681c980ce3a68746e377874ac8575eb27a6f9a;hpb=845401fd312c66c059aaee1772ac5d79555ab4fc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 08681c980..63f2db883 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1,3 +1,40 @@
+#include "g_world.qh"
+#include "_all.qh"
+
+#include "anticheat.qh"
+#include "antilag.qh"
+#include "bot/bot.qh"
+#include "campaign.qh"
+#include "cheats.qh"
+#include "cl_client.qh"
+#include "command/common.qh"
+#include "command/getreplies.qh"
+#include "command/sv_cmd.qh"
+#include "command/vote.qh"
+#include "g_hook.qh"
+#include "ipban.qh"
+#include "mapvoting.qh"
+#include "mutators/mutators_include.qh"
+#include "race.qh"
+#include "scores.qh"
+#include "secret.qh"
+#include "teamplay.qh"
+#include "waypointsprites.qh"
+#include "weapons/weaponstats.qh"
+#include "../common/buffs.qh"
+#include "../common/constants.qh"
+#include "../common/deathtypes.qh"
+#include "../common/mapinfo.qh"
+#include "../common/monsters/monsters.qh"
+#include "../common/monsters/sv_monsters.qh"
+#include "../common/notifications.qh"
+#include "../common/playerstats.qh"
+#include "../common/stats.qh"
+#include "../common/teams.qh"
+#include "../common/util.qh"
+#include "../common/items/all.qh"
+#include "../common/weapons/weapons.qh"
+
 const float LATENCY_THINKRATE = 10;
 .float latency_sum;
 .float latency_cnt;
@@ -56,9 +93,7 @@ string redirection_target;
 float world_initialized;
 
 string GetGametype();
-void GotoNextMap(float reinit);
 void ShuffleMaplist();
-float(float reinit) DoNextMapOverride;
 
 void SetDefaultAlpha()
 {
@@ -277,15 +312,21 @@ void cvar_changes_init()
 		// does nothing visible
 		BADCVAR("captureleadlimit_override");
 		BADCVAR("g_balance_kill_delay");
+		BADCVAR("g_ca_point_limit");
 		BADCVAR("g_ca_point_leadlimit");
 		BADCVAR("g_ctf_captimerecord_always");
 		BADCVAR("g_ctf_flag_glowtrails");
 		BADCVAR("g_ctf_flag_pickup_verbosename");
 		BADCVAR("g_domination_point_leadlimit");
 		BADCVAR("g_forced_respawn");
+		BADCVAR("g_freezetag_point_limit");
+		BADCVAR("g_freezetag_point_leadlimit");
 		BADCVAR("g_keyhunt_point_leadlimit");
 		BADPREFIX("g_mod_");
+		BADCVAR("g_invasion_point_limit");
 		BADCVAR("g_nexball_goalleadlimit");
+		BADCVAR("g_tdm_point_limit");
+		BADCVAR("g_tdm_point_leadlimit");
 		BADCVAR("leadlimit_and_fraglimit");
 		BADCVAR("leadlimit_override");
 		BADCVAR("pausable");
@@ -439,7 +480,7 @@ void detect_maptype()
 	vector o, v;
 	float i;
 
-	for(0;;)
+	for (;;)
 	{
 		o = world.mins;
 		o.x += random() * (world.maxs.x - world.mins.x);
@@ -466,7 +507,7 @@ void detect_maptype()
 }
 
 entity randomseed;
-float RandomSeed_Send(entity to, float sf)
+float RandomSeed_Send(entity to, int sf)
 {
 	WriteByte(MSG_ENTITY, ENT_CLIENT_RANDOMSEED);
 	WriteShort(MSG_ENTITY, self.cnt);
@@ -516,6 +557,7 @@ void spawnfunc___init_dedicated_server(void)
 	// needs to be done so early because of the constants they create
 	CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
 	CALL_ACCUMULATED_FUNCTION(RegisterMonsters);
+	CALL_ACCUMULATED_FUNCTION(RegisterItems);
 	CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
 	CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
 	CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
@@ -533,7 +575,7 @@ void WeaponStats_Init();
 void WeaponStats_Shutdown();
 void spawnfunc_worldspawn (void)
 {
-	float fd, l, i, j, n;
+	float fd, l, j, n;
 	string s;
 
 	cvar = cvar_normal;
@@ -564,6 +606,7 @@ void spawnfunc_worldspawn (void)
 	// needs to be done so early because of the constants they create
 	CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
 	CALL_ACCUMULATED_FUNCTION(RegisterMonsters);
+	CALL_ACCUMULATED_FUNCTION(RegisterItems);
 	CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
 	CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
 	CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
@@ -643,7 +686,7 @@ void spawnfunc_worldspawn (void)
 	// character set: ASCII 33-126 without the following characters: : ; ' " \ $
 	if(autocvar_sv_eventlog)
 	{
-		s = sprintf("%d.%s.%06d", ftos(autocvar_sv_eventlog_files_counter), strftime(false, "%s"), floor(random() * 1000000));
+		s = sprintf("%d.%s.%06d", itos(autocvar_sv_eventlog_files_counter), strftime(false, "%s"), floor(random() * 1000000));
 		matchid = strzone(s);
 
 		GameLogEcho(strcat(":gamestart:", GetGametype(), "_", GetMapname(), ":", s));
@@ -764,7 +807,7 @@ void spawnfunc_worldspawn (void)
 	addstat(STAT_VORTEX_CHARGEPOOL, AS_FLOAT, vortex_chargepool_ammo);
 
 	addstat(STAT_HAGAR_LOAD, AS_INT, hagar_load);
-	
+
 	addstat(STAT_ARC_HEAT, AS_FLOAT, arc_heat_percent);
 
 	// freeze attacks
@@ -796,7 +839,7 @@ void spawnfunc_worldspawn (void)
 	maplist_reply = strzone(getmaplist());
 	lsmaps_reply = strzone(getlsmaps());
 	monsterlist_reply = strzone(getmonsterlist());
-	for(i = 0; i < 10; ++i)
+	for(int i = 0; i < 10; ++i)
 	{
 		s = getrecords(i);
 		if (s)
@@ -819,7 +862,7 @@ void spawnfunc_worldspawn (void)
 	{
 		s = "";
 		n = tokenize_console(cvar_string("sv_curl_serverpackages"));
-		for(i = 0; i < n; ++i)
+		for(int i = 0; i < n; ++i)
 			if(substring(argv(i), -18, -1) != "-serverpackage.txt")
 			if(substring(argv(i), -14, -1) != ".serverpackage") // OLD legacy
 				s = strcat(s, " ", argv(i));
@@ -827,7 +870,7 @@ void spawnfunc_worldspawn (void)
 		if(fd >= 0)
 		{
 			j = search_getsize(fd);
-			for(i = 0; i < j; ++i)
+			for(int i = 0; i < j; ++i)
 				s = strcat(s, " ", search_getfilename(fd, i));
 			search_end(fd);
 		}
@@ -835,7 +878,7 @@ void spawnfunc_worldspawn (void)
 		if(fd >= 0)
 		{
 			j = search_getsize(fd);
-			for(i = 0; i < j; ++i)
+			for(int i = 0; i < j; ++i)
 				s = strcat(s, " ", search_getfilename(fd, i));
 			search_end(fd);
 		}
@@ -1201,7 +1244,7 @@ float DoNextMapOverride(float reinit)
 		string m;
 		m = GameTypeVote_MapInfo_FixName(autocvar_nextmap);
 		cvar_set("nextmap",m);
-	
+
 		if(!m || gametypevote)
 			return false;
 		if(autocvar_sv_vote_gametype)
@@ -1209,7 +1252,7 @@ float DoNextMapOverride(float reinit)
 			Map_Goto_SetStr(m);
 			return false;
 		}
-		
+
 		if(MapInfo_CheckMap(m))
 		{
 			Map_Goto_SetStr(m);
@@ -1543,15 +1586,6 @@ void CheckRules_Player()
 	//   (div0: and that in CheckRules_World please)
 }
 
-float checkrules_equality;
-float checkrules_suddendeathwarning;
-float checkrules_suddendeathend;
-float checkrules_overtimesadded; //how many overtimes have been already added
-
-const float WINNING_NO = 0; // no winner, but time limits may terminate the game
-const float WINNING_YES = 1; // winner found
-const float WINNING_NEVER = 2; // no winner, enter overtime if time limit is reached
-const float WINNING_STARTSUDDENDEATHOVERTIME = 3; // no winner, enter suddendeath overtime NOW
 
 float InitiateSuddenDeath()
 {
@@ -1616,7 +1650,7 @@ void SetWinners(.float field, float value)
 {
 	entity head;
 	FOR_EACH_PLAYER(head)
-		head.winning = (head.field == value);
+		head.winning = (head.(field) == value);
 }
 
 // set the .winning flag for those players with a given field value
@@ -1624,7 +1658,7 @@ void AddWinners(.float field, float value)
 {
 	entity head;
 	FOR_EACH_PLAYER(head)
-		if(head.field == value)
+		if (head.(field) == value)
 			head.winning = 1;
 }
 
@@ -1930,7 +1964,7 @@ float WinningCondition_RanOutOfSpawns()
 	if(have_team_spawns <= 0)
 		return WINNING_NO;
 
-	if(autocvar_g_spawn_useallspawns <= 0)
+	if(!autocvar_g_spawn_useallspawns)
 		return WINNING_NO;
 
 	if(!some_spawn_has_been_used)
@@ -2002,7 +2036,6 @@ CheckRules_World
 Exit deathmatch games upon conditions
 ============
 */
-void ReadyRestart();
 void CheckRules_World()
 {
 	float timelimit;