X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=5779a511dbb4a230af53322461c125a917c43bf5;hb=6f37a8f8076a572097afb13de2c367a72717c927;hp=b25528e1645ccf1f635a20e5ae2866dc05eaf045;hpb=0f3709f96ff607455d69dc4844e39a8ea0587675;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index b25528e16..5779a511d 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -1,10 +1,39 @@
+#include "_.qh"
+
+#include "anticheat.qh"
+#include "g_hook.qh"
+#include "g_world.qh"
+
+#include "bot/bot.qh"
+#include "bot/waypoints.qh"
+
+#include "command/common.qh"
+
+#include "mutators/mutators_include.qh"
+#include "vehicles/vehicles_def.qh"
+#include "weapons/csqcprojectile.qh"
+
+#include "../common/constants.qh"
+#include "../common/deathtypes.qh"
+#include "../common/mapinfo.qh"
+#include "../common/util.qh"
+
+#include "../common/weapons/weapons.qh"
+
+#include "../csqcmodellib/sv_model.qh"
+
+#include "../warpzonelib/common.qh"
+#include "../warpzonelib/server.qh"
+
+.float lastground;
+
 void CreatureFrame (void)
 {
 	entity oldself;
 	float dm;
 
 	oldself = self;
-	for(self = world; (self = findfloat(self, damagedbycontents, TRUE)); )
+	for(self = world; (self = findfloat(self, damagedbycontents, true)); )
 	{
 		if (self.movetype == MOVETYPE_NOCLIP) { continue; }
 
@@ -210,10 +239,10 @@ void StartFrame (void)
 	skill = autocvar_skill;
 
 	// detect when the pre-game countdown (if any) has ended and the game has started
-	game_delay = (time < game_starttime) ? TRUE : FALSE;
+	game_delay = (time < game_starttime) ? true : false;
 
-	if(game_delay_last == TRUE)
-	if(game_delay == FALSE)
+	if(game_delay_last == true)
+	if(game_delay == false)
 	if(autocvar_sv_eventlog)
 		GameLogEcho(":startdelay_ended");
 
@@ -379,20 +408,20 @@ void SV_OnEntityPreSpawnFunction()
 	else if (self.angles == '0 -2 0')
 		self.angles = '+90 0 0';
 
-	if(self.originjitter_x != 0)
-		self.origin_x = self.origin_x + (random() * 2 - 1) * self.originjitter_x;
-	if(self.originjitter_y != 0)
-		self.origin_y = self.origin_y + (random() * 2 - 1) * self.originjitter_y;
-	if(self.originjitter_z != 0)
-		self.origin_z = self.origin_z + (random() * 2 - 1) * self.originjitter_z;
-	if(self.anglesjitter_x != 0)
-		self.angles_x = self.angles_x + (random() * 2 - 1) * self.anglesjitter_x;
-	if(self.anglesjitter_y != 0)
-		self.angles_y = self.angles_y + (random() * 2 - 1) * self.anglesjitter_y;
-	if(self.anglesjitter_z != 0)
-		self.angles_z = self.angles_z + (random() * 2 - 1) * self.anglesjitter_z;
+	if(self.originjitter.x != 0)
+		self.origin_x = self.origin.x + (random() * 2 - 1) * self.originjitter.x;
+	if(self.originjitter.y != 0)
+		self.origin_y = self.origin.y + (random() * 2 - 1) * self.originjitter.y;
+	if(self.originjitter.z != 0)
+		self.origin_z = self.origin.z + (random() * 2 - 1) * self.originjitter.z;
+	if(self.anglesjitter.x != 0)
+		self.angles_x = self.angles.x + (random() * 2 - 1) * self.anglesjitter.x;
+	if(self.anglesjitter.y != 0)
+		self.angles_y = self.angles.y + (random() * 2 - 1) * self.anglesjitter.y;
+	if(self.anglesjitter.z != 0)
+		self.angles_z = self.angles.z + (random() * 2 - 1) * self.anglesjitter.z;
 	if(self.anglejitter != 0)
-		self.angles_y = self.angles_y + (random() * 2 - 1) * self.anglejitter;
+		self.angles_y = self.angles.y + (random() * 2 - 1) * self.anglejitter;
 
 	if(MUTATOR_CALLHOOK(OnEntityPreSpawn))
 	{