X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=138051827bcad56fac48d9ed1f993596a8f405cc;hp=0f7d1763b0ce2ebf184661f5ad8182f7173498b2;hb=cd508c593bc52d211c1675e1e52ae741cc487ab3;hpb=5b3d38ffdd942aa1647d747e8e6e4605df39cb82

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 0f7d1763b..138051827 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -10,7 +10,6 @@
 #include "command/common.qh"
 
 #include "mutators/mutators_include.qh"
-#include "vehicles/vehicle.qh"
 #include "weapons/csqcprojectile.qh"
 
 #include "../common/constants.qh"
@@ -18,6 +17,7 @@
 #include "../common/mapinfo.qh"
 #include "../common/util.qh"
 
+#include "../common/vehicles/all.qh"
 #include "../common/weapons/all.qh"
 
 #include "../csqcmodellib/sv_model.qh"
@@ -28,18 +28,17 @@
 .float lastground;
 
 void CreatureFrame (void)
-{
-	entity oldself;
+{SELFPARAM();
 	float dm;
 
-	oldself = self;
-	for(self = world; (self = findfloat(self, damagedbycontents, true)); )
+	for(entity e = world; (e = findfloat(e, damagedbycontents, true)); )
 	{
+		setself(e);
 		if (self.movetype == MOVETYPE_NOCLIP) { continue; }
 
-		float vehic = (self.vehicle_flags & VHF_ISVEHICLE);
+		float vehic = IS_VEHICLE(self);
 		float projectile = (self.flags & FL_PROJECTILE);
-		float monster = (self.flags & FL_MONSTER);
+		float monster = IS_MONSTER(self);
 
 		if (self.watertype <= CONTENT_WATER && self.waterlevel > 0) // workaround a retarded bug made by id software :P (yes, it's that old of a bug)
 		{
@@ -91,7 +90,7 @@ void CreatureFrame (void)
 						if (self.watersound_finished < time)
 						{
 							self.watersound_finished = time + 0.5;
-							sound (self, CH_PLAYER_SINGLE, "player/lava.wav", VOL_BASE, ATTEN_NORM);
+							sound (self, CH_PLAYER_SINGLE, SND_LAVA, VOL_BASE, ATTEN_NORM);
 						}
 						Damage (self, world, world, autocvar_g_balance_contents_playerdamage_lava * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_LAVA, self.origin, '0 0 0');
 					}
@@ -100,7 +99,7 @@ void CreatureFrame (void)
 						if (self.watersound_finished < time)
 						{
 							self.watersound_finished = time + 0.5;
-							sound (self, CH_PLAYER_SINGLE, "player/slime.wav", VOL_BASE, ATTEN_NORM);
+							sound (self, CH_PLAYER_SINGLE, SND_SLIME, VOL_BASE, ATTEN_NORM);
 						}
 						Damage (self, world, world, autocvar_g_balance_contents_playerdamage_slime * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_SLIME, self.origin, '0 0 0');
 					}
@@ -140,6 +139,7 @@ void CreatureFrame (void)
 			if (g_footsteps)
 			if (!gameover)
 			if (self.flags & FL_ONGROUND)
+			if (!self.crouch)
 			if (velocity_len > autocvar_sv_maxspeed * 0.6)
 			if (!self.deadflag)
 			if (time < self.lastground + 0.2)
@@ -168,7 +168,7 @@ void CreatureFrame (void)
 
         self.oldvelocity = self.velocity;
 	}
-	self = oldself;
+	setself(this);
 }
 
 
@@ -185,7 +185,7 @@ float game_delay_last;
 
 float RedirectionThink();
 void StartFrame (void)
-{
+{SELFPARAM();
 	execute_next_frame();
 
 	remove = remove_unsafely; // not during spawning!
@@ -199,7 +199,7 @@ void StartFrame (void)
 		float t, pp, c_seeing, c_seen;
 		entity cl;
 		t = client_cefc_accumulator / (time - client_cefc_accumulatortime);
-		print("CEFC time: ", ftos(t * 1000), "ms; ");
+		LOG_INFO("CEFC time: ", ftos(t * 1000), "ms; ");
 		c_seeing = 0;
 		c_seen = 0;
 		FOR_EACH_CLIENT(cl)
@@ -209,16 +209,15 @@ void StartFrame (void)
 			if(IS_PLAYER(cl))
 				++c_seen;
 		}
-		print("CEFC calls per second: ", ftos(c_seeing * (c_seen - 1) / t), "; ");
-		print("CEFC 100% load at: ", ftos(solve_quadratic(t, -t, -1) * '0 1 0'), "\n");
+		LOG_INFO("CEFC calls per second: ", ftos(c_seeing * (c_seen - 1) / t), "; ");
+		LOG_INFO("CEFC 100% load at: ", ftos(solve_quadratic(t, -t, -1) * '0 1 0'), "\n");
 
 		client_cefc_accumulatortime = time;
 		client_cefc_accumulator = 0;
 	}
 #endif
 
-	entity e;
-	for(e = world; (e = findfloat(e, csqcprojectile_clientanimate, 1)); )
+	for(entity e = world; (e = findfloat(e, csqcprojectile_clientanimate, 1)); )
 		CSQCProjectile_Check(e);
 
 	if(RedirectionThink())
@@ -263,8 +262,9 @@ void StartFrame (void)
 
 	bot_serverframe();
 
-	FOR_EACH_PLAYER(self)
-		self.porto_forbidden = max(0, self.porto_forbidden - 1);
+	entity e;
+	FOR_EACH_PLAYER(e)
+		e.porto_forbidden = max(0, e.porto_forbidden - 1);
 
 	anticheat_startframe();
 
@@ -278,7 +278,7 @@ void StartFrame (void)
 .string cvarfilter;
 float DoesQ3ARemoveThisEntity();
 void SV_OnEntityPreSpawnFunction()
-{
+{SELFPARAM();
 	if (self)
 	if (self.gametypefilter != "")
 	if (!isGametypeInFilter(MapInfo_LoadedGametype, teamplay, have_team_spawns, self.gametypefilter))