X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=7cb5f69803fb097918f2e7382e64cc91a572df7c;hb=8cbf0e84432e075e617f43c037c645ea9846eba0;hp=9d67d334669faa4802778388bd797d63206479ab;hpb=42a9e3d7ece2c716e5cd6899e90841acb7fb891b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 9d67d3346..7cb5f6980 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -129,11 +129,11 @@ void GotoFirstMap(entity this)
 
 	if(time < 5)
 	{
-		self.nextthink = time;
+		this.nextthink = time;
 	}
 	else
 	{
-		self.nextthink = time + 1;
+		this.nextthink = time + 1;
 		LOG_INFO("Waiting for _sv_init being set to 1 by initialization scripts...\n");
 	}
 }
@@ -528,7 +528,7 @@ void RandomSeed_Spawn()
 	setthink(randomseed, RandomSeed_Think);
 	Net_LinkEntity(randomseed, false, 0, RandomSeed_Send);
 
-	WITHSELF(randomseed, getthink(randomseed)(randomseed)); // sets random seed and nextthink
+	getthink(randomseed)(randomseed); // sets random seed and nextthink
 }
 
 spawnfunc(__init_dedicated_server)
@@ -548,7 +548,7 @@ spawnfunc(__init_dedicated_server)
 
 	e = new(info_player_deathmatch);  // safeguard against player joining
 
-	self.classname = "worldspawn"; // safeguard against various stuff ;)
+	this.classname = "worldspawn"; // safeguard against various stuff ;)
 
 	// needs to be done so early because of the constants they create
 	static_init();
@@ -739,7 +739,7 @@ spawnfunc(worldspawn)
 	player_count = 0;
 	bot_waypoints_for_items = autocvar_g_waypoints_for_items;
 	if(bot_waypoints_for_items == 1)
-		if(self.spawnflags & SPAWNFLAG_NO_WAYPOINTS_FOR_ITEMS)
+		if(this.spawnflags & SPAWNFLAG_NO_WAYPOINTS_FOR_ITEMS)
 			bot_waypoints_for_items = 0;
 
 	precache();
@@ -760,7 +760,7 @@ spawnfunc(worldspawn)
 		s = ":gameinfo:mutators:LIST";
 
 		MUTATOR_CALLHOOK(BuildMutatorsString, s);
-		s = ret_string;
+		s = M_ARGV(0, string);
 
 		// initialiation stuff, not good in the mutator system
 		if(!autocvar_g_use_ammunition)
@@ -915,14 +915,14 @@ spawnfunc(worldspawn)
 	// save it for later
 	modname = strzone(modname);
 
-	WinningConditionHelper(); // set worldstatus
+	WinningConditionHelper(this); // set worldstatus
 
 	world_initialized = 1;
 }
 
 spawnfunc(light)
 {
-	//makestatic (self); // Who the f___ did that?
+	//makestatic (this); // Who the f___ did that?
 	remove(this);
 }
 
@@ -1296,18 +1296,18 @@ When the player presses attack or jump, change to the next level
 ============
 */
 .float autoscreenshot;
-void IntermissionThink()
-{SELFPARAM();
-	FixIntermissionClient(self);
+void IntermissionThink(entity this)
+{
+	FixIntermissionClient(this);
 
-	float server_screenshot = (autocvar_sv_autoscreenshot && self.cvar_cl_autoscreenshot);
-	float client_screenshot = (self.cvar_cl_autoscreenshot == 2);
+	float server_screenshot = (autocvar_sv_autoscreenshot && this.cvar_cl_autoscreenshot);
+	float client_screenshot = (this.cvar_cl_autoscreenshot == 2);
 
 	if( (server_screenshot || client_screenshot)
-		&& ((self.autoscreenshot > 0) && (time > self.autoscreenshot)) )
+		&& ((this.autoscreenshot > 0) && (time > this.autoscreenshot)) )
 	{
-		self.autoscreenshot = -1;
-		if(IS_REAL_CLIENT(self)) { stuffcmd(self, sprintf("\nscreenshot screenshots/autoscreenshot/%s-%s.jpg; echo \"^5A screenshot has been taken at request of the server.\"\n", GetMapname(), strftime(false, "%s"))); }
+		this.autoscreenshot = -1;
+		if(IS_REAL_CLIENT(this)) { stuffcmd(this, sprintf("\nscreenshot screenshots/autoscreenshot/%s-%s.jpg; echo \"^5A screenshot has been taken at request of the server.\"\n", GetMapname(), strftime(false, "%s"))); }
 		return;
 	}
 
@@ -1315,7 +1315,7 @@ void IntermissionThink()
 		return;
 
 	if(!mapvote_initialized)
-		if (time < intermission_exittime + 10 && !(PHYS_INPUT_BUTTON_ATCK(self) || PHYS_INPUT_BUTTON_JUMP(self) || PHYS_INPUT_BUTTON_ATCK2(self) || PHYS_INPUT_BUTTON_HOOK(self) || PHYS_INPUT_BUTTON_USE(self)))
+		if (time < intermission_exittime + 10 && !(PHYS_INPUT_BUTTON_ATCK(this) || PHYS_INPUT_BUTTON_JUMP(this) || PHYS_INPUT_BUTTON_ATCK2(this) || PHYS_INPUT_BUTTON_HOOK(this) || PHYS_INPUT_BUTTON_USE(this)))
 			return;
 
 	MapVote_Start();
@@ -1432,7 +1432,7 @@ void DumpStats(float final)
 	FOREACH_CLIENT(IS_REAL_CLIENT(it) || (IS_BOT_CLIENT(it) && autocvar_sv_logscores_bots), LAMBDA(
 		s = strcat(":player:see-labels:", GetPlayerScoreString(it, 0), ":");
 		s = strcat(s, ftos(rint(time - it.jointime)), ":");
-		if(IS_PLAYER(it) || MUTATOR_CALLHOOK(GetPlayerStatus, it, s))
+		if(IS_PLAYER(it) || MUTATOR_CALLHOOK(GetPlayerStatus, it))
 			s = strcat(s, ftos(it.team), ":");
 		else
 			s = strcat(s, "spectator:");
@@ -1562,7 +1562,7 @@ void NextLevel()
 			bprint(it.netname, " ^7wins.\n");
 	));
 
-	WITHSELF(NULL, target_music_kill());
+	target_music_kill();
 
 	if(autocvar_g_campaign)
 		CampaignPreIntermission();
@@ -1579,8 +1579,8 @@ CheckRules_Player
 Exit deathmatch games upon conditions
 ============
 */
-void CheckRules_Player()
-{SELFPARAM();
+void CheckRules_Player(entity this)
+{
 	if (gameover)	// someone else quit the game already
 		return;
 
@@ -1682,7 +1682,7 @@ float WinningCondition_Scores(float limit, float leadlimit)
 	float limitreached;
 
 	// TODO make everything use THIS winning condition (except LMS)
-	WinningConditionHelper();
+	WinningConditionHelper(NULL);
 
 	if(teamplay)
 	{
@@ -1928,7 +1928,7 @@ void CheckRules_World()
 	if(checkrules_status == WINNING_YES)
 		bprint("Hey! Someone ran out of spawns!\n");
 	else if(MUTATOR_CALLHOOK(CheckRules_World, checkrules_status, timelimit, fraglimit))
-		checkrules_status = ret_float;
+		checkrules_status = M_ARGV(0, float);
 	else
 		checkrules_status = WinningCondition_Scores(fraglimit, leadlimit);