X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=b202f284f6b664903899c35c0514824928592481;hp=722a8da753cd7158b72cb5d4cca6e47968b6ddaa;hb=a39af09cb4b15ec94461af2c1f314098ffe7ce0c;hpb=7bae88d09fbd53cce732e31633aea92671b43699

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 722a8da753..b202f284f6 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -3,7 +3,6 @@
 
 #include "anticheat.qh"
 #include "antilag.qh"
-#include "bot/bot.qh"
 #include "campaign.qh"
 #include "cheats.qh"
 #include "cl_client.qh"
@@ -19,10 +18,10 @@
 #include "scores.qh"
 #include "teamplay.qh"
 #include "weapons/weaponstats.qh"
-#include "../common/buffs.qh"
+#include "../common/buffs/all.qh"
 #include "../common/constants.qh"
 #include "../common/deathtypes.qh"
-#include "../common/effects.qh"
+#include "../common/effects/effects.qh"
 #include "../common/mapinfo.qh"
 #include "../common/monsters/all.qh"
 #include "../common/monsters/sv_monsters.qh"
@@ -41,7 +40,7 @@ const float LATENCY_THINKRATE = 10;
 .float latency_time;
 entity pingplreport;
 void PingPLReport_Think()
-{
+{SELFPARAM();
 	float delta;
 	entity e;
 
@@ -117,7 +116,7 @@ void SetDefaultAlpha()
 }
 
 void GotoFirstMap()
-{
+{SELFPARAM();
 	float n;
 	if(autocvar__sv_init)
 	{
@@ -146,7 +145,7 @@ void GotoFirstMap()
 	else
 	{
 		self.nextthink = time + 1;
-		print("Waiting for _sv_init being set to 1 by initialization scripts...\n");
+		LOG_INFO("Waiting for _sv_init being set to 1 by initialization scripts...\n");
 	}
 }
 
@@ -350,6 +349,8 @@ void cvar_changes_init()
 		BADPREFIX("timelimit_");
 		BADCVAR("gameversion");
 		BADPREFIX("gameversion_");
+		BADCVAR("sv_minigames");
+		BADPREFIX("sv_minigames_");
 		BADCVAR("sv_namechangetimer");
 
 		// allowed changes to server admins (please sync this to server.cfg)
@@ -501,7 +502,7 @@ void detect_maptype()
 			tracebox(o, '-1 -1 -1' * i, '1 1 1' * i, o - '0 0 32768', MOVE_WORLDONLY, world);
 	if(trace_fraction == 1)
 		continue;
-			print(ftos(i), " -> ", vtos(trace_endpos), "\n");
+			LOG_INFO(ftos(i), " -> ", vtos(trace_endpos), "\n");
 		}
 
 		break;
@@ -510,33 +511,29 @@ void detect_maptype()
 }
 
 entity randomseed;
-float RandomSeed_Send(entity to, int sf)
+bool RandomSeed_Send(entity this, entity to, int sf)
 {
 	WriteByte(MSG_ENTITY, ENT_CLIENT_RANDOMSEED);
 	WriteShort(MSG_ENTITY, self.cnt);
 	return true;
 }
 void RandomSeed_Think()
-{
+{SELFPARAM();
 	self.cnt = bound(0, floor(random() * 65536), 65535);
 	self.nextthink = time + 5;
 
 	self.SendFlags |= 1;
 }
 void RandomSeed_Spawn()
-{
+{SELFPARAM();
 	randomseed = spawn();
 	randomseed.think = RandomSeed_Think;
 	Net_LinkEntity(randomseed, false, 0, RandomSeed_Send);
 
-	entity oldself;
-	oldself = self;
-	self = randomseed;
-	self.think(); // sets random seed and nextthink
-	self = oldself;
+	WITH(entity, self, randomseed, randomseed.think()); // sets random seed and nextthink
 }
 
-void spawnfunc___init_dedicated_server(void)
+spawnfunc(__init_dedicated_server)
 {
 	// handler for _init/_init map (only for dedicated server initialization)
 
@@ -559,10 +556,8 @@ void spawnfunc___init_dedicated_server(void)
 
 	// needs to be done so early because of the constants they create
 	static_init();
-	CALL_ACCUMULATED_FUNCTION(RegisterTurrets);
 	CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
 	CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
-	CALL_ACCUMULATED_FUNCTION(RegisterEffects);
 
 	MapInfo_Enumerate();
 	MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
@@ -575,7 +570,7 @@ void ClientInit_Spawn();
 void WeaponStats_Init();
 void WeaponStats_Shutdown();
 void Physics_AddStats();
-void spawnfunc_worldspawn (void)
+spawnfunc(worldspawn)
 {
 	float fd, l, j, n;
 	string s;
@@ -607,12 +602,8 @@ void spawnfunc_worldspawn (void)
 
 	// needs to be done so early because of the constants they create
 	static_init();
-	CALL_ACCUMULATED_FUNCTION(RegisterTurrets);
 	CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
 	CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
-	CALL_ACCUMULATED_FUNCTION(RegisterEffects);
-
-	initialize_minigames();
 
 	ServerProgsDB = db_load(strcat("server.db", autocvar_sessionid));
 
@@ -666,7 +657,6 @@ void spawnfunc_worldspawn (void)
 
 	PlayerStats_GameReport_Init(); // we need this to be initiated before InitGameplayMode
 
-	precache_model ("null"); // we need this one before InitGameplayMode
 	InitGameplayMode();
 	readlevelcvars();
 	GrappleHookInit();
@@ -697,10 +687,6 @@ void spawnfunc_worldspawn (void)
 		MUTATOR_CALLHOOK(BuildMutatorsString, s);
 		s = ret_string;
 
-		// simple, probably not good in the mutator system
-		if(autocvar_g_grappling_hook)
-			s = strcat(s, ":grappling_hook");
-
 		// initialiation stuff, not good in the mutator system
 		if(!autocvar_g_use_ammunition)
 			s = strcat(s, ":no_use_ammunition");
@@ -755,23 +741,23 @@ void spawnfunc_worldspawn (void)
 					continue;
 				if(argv(0) == "cd")
 				{
-					print("Found ^1UNSUPPORTED^7 cd loop command in .cfg file; put this line in mapinfo instead:\n");
-					print("  cdtrack ", argv(2), "\n");
+					LOG_INFO("Found ^1UNSUPPORTED^7 cd loop command in .cfg file; put this line in mapinfo instead:\n");
+					LOG_INFO("  cdtrack ", argv(2), "\n");
 				}
 				else if(argv(0) == "fog")
 				{
-					print("Found ^1UNSUPPORTED^7 fog command in .cfg file; put this line in worldspawn in the .map/.bsp/.ent file instead:\n");
-					print("  \"fog\" \"", s, "\"\n");
+					LOG_INFO("Found ^1UNSUPPORTED^7 fog command in .cfg file; put this line in worldspawn in the .map/.bsp/.ent file instead:\n");
+					LOG_INFO("  \"fog\" \"", s, "\"\n");
 				}
 				else if(argv(0) == "set")
 				{
-					print("Found ^1UNSUPPORTED^7 set command in .cfg file; put this line in mapinfo instead:\n");
-					print("  clientsettemp_for_type all ", argv(1), " ", argv(2), "\n");
+					LOG_INFO("Found ^1UNSUPPORTED^7 set command in .cfg file; put this line in mapinfo instead:\n");
+					LOG_INFO("  clientsettemp_for_type all ", argv(1), " ", argv(2), "\n");
 				}
 				else if(argv(0) != "//")
 				{
-					print("Found ^1UNSUPPORTED^7 set command in .cfg file; put this line in mapinfo instead:\n");
-					print("  clientsettemp_for_type all ", argv(0), " ", argv(1), "\n");
+					LOG_INFO("Found ^1UNSUPPORTED^7 set command in .cfg file; put this line in mapinfo instead:\n");
+					LOG_INFO("  clientsettemp_for_type all ", argv(0), " ", argv(1), "\n");
 				}
 			}
 			fclose(fd);
@@ -925,7 +911,7 @@ void spawnfunc_worldspawn (void)
 	world_initialized = 1;
 }
 
-void spawnfunc_light (void)
+spawnfunc(light)
 {
 	//makestatic (self); // Who the f___ did that?
 	remove(self);
@@ -972,39 +958,39 @@ float MapHasRightSize(string map)
 	if(currentbots || autocvar_bot_number || player_count < autocvar_minplayers)
 	if(autocvar_g_maplist_check_waypoints)
 	{
-		dprint("checkwp "); dprint(map);
+		LOG_TRACE("checkwp "); LOG_TRACE(map);
 		if(!fexists(strcat("maps/", map, ".waypoints")))
 		{
-			dprint(": no waypoints\n");
+			LOG_TRACE(": no waypoints\n");
 			return false;
 		}
-		dprint(": has waypoints\n");
+		LOG_TRACE(": has waypoints\n");
 	}
 
 	// open map size restriction file
-	dprint("opensize "); dprint(map);
+	LOG_TRACE("opensize "); LOG_TRACE(map);
 	fh = fopen(strcat("maps/", map, ".sizes"), FILE_READ);
 	if(fh >= 0)
 	{
 		float mapmin, mapmax;
-		dprint(": ok, ");
+		LOG_TRACE(": ok, ");
 		mapmin = stof(fgets(fh));
 		mapmax = stof(fgets(fh));
 		fclose(fh);
 		if(player_count < mapmin)
 		{
-			dprint("not enough\n");
+			LOG_TRACE("not enough\n");
 			return false;
 		}
 		if(player_count > mapmax)
 		{
-			dprint("too many\n");
+			LOG_TRACE("too many\n");
 			return false;
 		}
-		dprint("right size\n");
+		LOG_TRACE("right size\n");
 		return true;
 	}
-	dprint(": not found\n");
+	LOG_TRACE(": not found\n");
 	return true;
 }
 
@@ -1013,22 +999,6 @@ string Map_Filename(float position)
 	return strcat("maps/", argv(position), ".bsp");
 }
 
-string strwords(string s, float w)
-{
-	float endpos;
-	for(endpos = 0; w && endpos >= 0; --w)
-		endpos = strstrofs(s, " ", endpos + 1);
-	if(endpos < 0)
-		return s;
-	else
-		return substring(s, 0, endpos);
-}
-
-float strhasword(string s, string w)
-{
-	return strstrofs(strcat(" ", s, " "), strcat(" ", w, " "), 0) >= 0;
-}
-
 void Map_MarkAsRecent(string m)
 {
 	cvar_set("g_maplist_mostrecent", strwords(strcat(m, " ", autocvar_g_maplist_mostrecent), max(0, autocvar_g_maplist_mostrecent_count)));
@@ -1059,7 +1029,7 @@ float Map_Check(float position, float pass)
 		return 0;
 	}
 	else
-		dprint( "Couldn't select '", filename, "'..\n" );
+		LOG_TRACE( "Couldn't select '", filename, "'..\n" );
 
 	return 0;
 }
@@ -1092,7 +1062,7 @@ float() MaplistMethod_Iterate = // usual method
 {
 	float pass, i;
 
-	dprint("Trying MaplistMethod_Iterate\n");
+	LOG_TRACE("Trying MaplistMethod_Iterate\n");
 
 	for(pass = 1; pass <= 2; ++pass)
 	{
@@ -1109,7 +1079,7 @@ float() MaplistMethod_Iterate = // usual method
 
 float() MaplistMethod_Repeat = // fallback method
 {
-	dprint("Trying MaplistMethod_Repeat\n");
+	LOG_TRACE("Trying MaplistMethod_Repeat\n");
 
 	if(Map_Check(Map_Current, 2))
 		return Map_Current;
@@ -1120,7 +1090,7 @@ float() MaplistMethod_Random = // random map selection
 {
 	float i, imax;
 
-	dprint("Trying MaplistMethod_Random\n");
+	LOG_TRACE("Trying MaplistMethod_Random\n");
 
 	imax = 42;
 
@@ -1140,7 +1110,7 @@ float(float exponent) MaplistMethod_Shuffle = // more clever shuffling
 {
 	float i, j, imax, insertpos;
 
-	dprint("Trying MaplistMethod_Shuffle\n");
+	LOG_TRACE("Trying MaplistMethod_Shuffle\n");
 
 	imax = 42;
 
@@ -1152,7 +1122,7 @@ float(float exponent) MaplistMethod_Shuffle = // more clever shuffling
 		insertpos = pow(random(), 1 / exponent);       // ]0, 1]
 		insertpos = insertpos * (Map_Count - 1);       // ]0, Map_Count - 1]
 		insertpos = ceil(insertpos) + 1;               // {2, 3, 4, ..., Map_Count}
-		dprint("SHUFFLE: insert pos = ", ftos(insertpos), "\n");
+		LOG_TRACE("SHUFFLE: insert pos = ", ftos(insertpos), "\n");
 
 		// insert the current map there
 		newlist = "";
@@ -1318,7 +1288,7 @@ When the player presses attack or jump, change to the next level
 */
 .float autoscreenshot;
 void IntermissionThink()
-{
+{SELFPARAM();
 	FixIntermissionClient(self);
 
 	float server_screenshot = (autocvar_sv_autoscreenshot && self.cvar_cl_autoscreenshot);
@@ -1428,7 +1398,7 @@ void DumpStats(float final)
 	s = strcat(s, GetGametype(), "_", GetMapname(), ":", ftos(rint(time)));
 
 	if(to_console)
-		print(s, "\n");
+		LOG_INFO(s, "\n");
 	if(to_eventlog)
 		GameLogEcho(s);
 
@@ -1444,7 +1414,7 @@ void DumpStats(float final)
 
 	s = strcat(":labels:player:", GetPlayerScoreString(world, 0));
 	if(to_console)
-		print(s, "\n");
+		LOG_INFO(s, "\n");
 	if(to_eventlog)
 		GameLogEcho(s);
 	if(to_file)
@@ -1462,7 +1432,7 @@ void DumpStats(float final)
 				s = strcat(s, "spectator:");
 
 			if(to_console)
-				print(s, other.netname, "\n");
+				LOG_INFO(s, other.netname, "\n");
 			if(to_eventlog)
 				GameLogEcho(strcat(s, ftos(other.playerid), ":", other.netname));
 			if(to_file)
@@ -1474,7 +1444,7 @@ void DumpStats(float final)
 	{
 		s = strcat(":labels:teamscores:", GetTeamScoreString(0, 0));
 		if(to_console)
-			print(s, "\n");
+			LOG_INFO(s, "\n");
 		if(to_eventlog)
 			GameLogEcho(s);
 		if(to_file)
@@ -1485,7 +1455,7 @@ void DumpStats(float final)
 			s = strcat(":teamscores:see-labels:", GetTeamScoreString(i, 0));
 			s = strcat(s, ":", ftos(i));
 			if(to_console)
-				print(s, "\n");
+				LOG_INFO(s, "\n");
 			if(to_eventlog)
 				GameLogEcho(s);
 			if(to_file)
@@ -1494,7 +1464,7 @@ void DumpStats(float final)
 	}
 
 	if(to_console)
-		print(":end\n");
+		LOG_INFO(":end\n");
 	if(to_eventlog)
 		GameLogEcho(":end");
 	if(to_file)
@@ -1595,7 +1565,7 @@ Exit deathmatch games upon conditions
 ============
 */
 void CheckRules_Player()
-{
+{SELFPARAM();
 	if (gameover)	// someone else quit the game already
 		return;
 
@@ -1694,7 +1664,7 @@ void ClearWinners(void)
 // they win. Otherwise the defending team wins once the timelimit passes.
 void assault_new_round();
 float WinningCondition_Assault()
-{
+{SELFPARAM();
 	float status;
 
 	WinningConditionHelper(); // set worldstatus
@@ -1727,11 +1697,7 @@ float WinningCondition_Assault()
 			}
 			else
 			{
-				entity oldself;
-				oldself = self;
-				self = ent;
-				assault_new_round();
-				self = oldself;
+				WITH(entity, self, ent, assault_new_round());
 			}
 		}
 	}
@@ -1799,7 +1765,7 @@ float WinningCondition_LMS()
 		{
 			// SNAFU (maybe a draw game?)
 			ClearWinners();
-			dprint("No players, ending game.\n");
+			LOG_TRACE("No players, ending game.\n");
 			return WINNING_YES;
 		}
 	}
@@ -1855,7 +1821,7 @@ float WinningCondition_Scores(float limit, float leadlimit)
 	if(WinningConditionHelper_zeroisworst)
 		leadlimit = 0; // not supported in this mode
 
-	if(g_dm || g_tdm || g_ca || g_freezetag || (g_race && !g_race_qualifying) || g_nexball)
+	if(MUTATOR_CALLHOOK(Scores_CountFragsRemaining))
 	// these modes always score in increments of 1, thus this makes sense
 	{
 		if(leaderfrags != WinningConditionHelper_topscore)
@@ -2202,19 +2168,20 @@ string GotoMap(string m)
 
 
 void EndFrame()
-{
+{SELFPARAM();
 	anticheat_endframe();
 
 	float altime;
-	FOR_EACH_REALCLIENT(self)
+	entity e_;
+	FOR_EACH_REALCLIENT(e_)
 	{
-		entity e = IS_SPEC(self) ? self.enemy : self;
+		entity e = IS_SPEC(e_) ? e_.enemy : e_;
 		if(e.typehitsound)
-			self.typehit_time = time;
+			e_.typehit_time = time;
 		else if(e.damage_dealt)
 		{
-			self.hit_time = time;
-			self.damage_dealt_total += ceil(e.damage_dealt);
+			e_.hit_time = time;
+			e_.damage_dealt_total += ceil(e.damage_dealt);
 		}
 	}
 	altime = time + frametime * (1 + autocvar_g_antilag_nudge);
@@ -2223,14 +2190,18 @@ void EndFrame()
 	// add another frametime because client shows everything with
 	// 1 frame of lag (cl_nolerp 0). The last +1 however should not be
 	// needed!
-	FOR_EACH_CLIENT(self)
+	FOR_EACH_CLIENT(e_)
+	{
+		e_.typehitsound = false;
+		e_.damage_dealt = 0;
+		setself(e_);
+		antilag_record(e_, altime);
+	}
+	FOR_EACH_MONSTER(e_)
 	{
-		self.typehitsound = false;
-		self.damage_dealt = 0;
-		antilag_record(self, altime);
+		setself(e_);
+		antilag_record(e_, altime);
 	}
-	FOR_EACH_MONSTER(self)
-		antilag_record(self, altime);
 }
 
 
@@ -2241,7 +2212,7 @@ void EndFrame()
 float redirection_timeout;
 float redirection_nextthink;
 float RedirectionThink()
-{
+{SELFPARAM();
 	float clients_found;
 
 	if(redirection_target == "")
@@ -2263,10 +2234,12 @@ float RedirectionThink()
 	redirection_nextthink = time + 1;
 
 	clients_found = 0;
-	FOR_EACH_REALCLIENT(self)
+	entity e;
+	FOR_EACH_REALCLIENT(e)
 	{
+		setself(e);
 		// TODO add timer
-		print("Redirecting: sending connect command to ", self.netname, "\n");
+		LOG_INFO("Redirecting: sending connect command to ", self.netname, "\n");
 		if(redirection_target == "self")
 			stuffcmd(self, "\ndisconnect; defer ", ftos(autocvar_quit_and_redirect_timer), " reconnect\n");
 		else
@@ -2274,7 +2247,7 @@ float RedirectionThink()
 		++clients_found;
 	}
 
-	print("Redirecting: ", ftos(clients_found), " clients left.\n");
+	LOG_INFO("Redirecting: ", ftos(clients_found), " clients left.\n");
 
 	if(time > redirection_timeout || clients_found == 0)
 		localcmd("\nwait; wait; wait; quit\n");
@@ -2307,7 +2280,7 @@ void Shutdown()
 	if(world_initialized > 0)
 	{
 		world_initialized = 0;
-		print("Saving persistent data...\n");
+		LOG_INFO("Saving persistent data...\n");
 		Ban_SaveBans();
 
 		// playerstats with unfinished match
@@ -2330,7 +2303,7 @@ void Shutdown()
 		CheatShutdown(); // must be after cheatcount check
 		db_close(ServerProgsDB);
 		db_close(TemporaryDB);
-		print("done!\n");
+		LOG_INFO("done!\n");
 		// tell the bot system the game is ending now
 		bot_endgame();
 
@@ -2339,6 +2312,6 @@ void Shutdown()
 	}
 	else if(world_initialized == 0)
 	{
-		print("NOTE: crashed before even initializing the world, not saving persistent data\n");
+		LOG_INFO("NOTE: crashed before even initializing the world, not saving persistent data\n");
 	}
 }