X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=09446203db69cf85d1588c0cdb459625244ff80e;hb=7f81a6b047e89c7e606e61f0dc37b574a5f2402a;hp=345b7fdb836964b8e184c7e00c3d4ff46b23a08e;hpb=3fbd72f57641ec279bdcf73f594c7b14982139aa;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 345b7fdb8..09446203d 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -4,6 +4,7 @@
 #include "g_hook.qh"
 #include "g_damage.qh"
 #include "g_world.qh"
+#include <server/gamelog.qh>
 
 #include "bot/api.qh"
 
@@ -46,7 +47,14 @@ void CreatureFrame_hotliquids(entity this)
 	}
 	else
 	{
-		if (this.watertype == CONTENT_LAVA)
+		if (STAT(FROZEN, this))
+		{
+			if (this.watertype == CONTENT_LAVA)
+				Damage(this, NULL, NULL, 10000, DEATH_LAVA.m_id, DMG_NOWEP, this.origin, '0 0 0');
+			else if (this.watertype == CONTENT_SLIME)
+				Damage(this, NULL, NULL, 10000, DEATH_SLIME.m_id, DMG_NOWEP, this.origin, '0 0 0');
+		}
+		else if (this.watertype == CONTENT_LAVA)
 		{
 			if (this.watersound_finished < time)
 			{
@@ -89,7 +97,6 @@ void CreatureFrame_Liquids(entity this)
 			this.flags &= ~FL_INWATER;
 			this.dmgtime = 0;
 		}
-		this.air_finished = time + 12;
 	}
 }
 
@@ -101,7 +108,6 @@ void CreatureFrame_FallDamage(entity this)
 		return; // if the entity hasn't moved and isn't moving, then don't do anything
 
 	// check for falling damage
-	float velocity_len = vlen(this.velocity);
 	bool have_hook = false;
 	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 	{
@@ -114,7 +120,11 @@ void CreatureFrame_FallDamage(entity this)
 	}
 	if(!have_hook)
 	{
-		float dm = vlen(this.oldvelocity) - velocity_len; // dm is now the velocity DECREASE. Velocity INCREASE should never cause a sound or any damage.
+		float dm; // dm is the velocity DECREASE. Velocity INCREASE should never cause a sound or any damage.
+		if(autocvar_g_balance_falldamage_onlyvertical)
+			dm = fabs(this.oldvelocity.z) - vlen(this.velocity);
+		else
+			dm = vlen(this.oldvelocity) - vlen(this.velocity);
 		if (IS_DEAD(this))
 			dm = (dm - autocvar_g_balance_falldamage_deadminspeed) * autocvar_g_balance_falldamage_factor;
 		else
@@ -127,7 +137,7 @@ void CreatureFrame_FallDamage(entity this)
 		}
 	}
 
-	if(autocvar_g_maxspeed > 0 && velocity_len > autocvar_g_maxspeed)
+	if(autocvar_g_maxspeed > 0 && vdist(this.velocity, >, autocvar_g_maxspeed))
 		Damage (this, NULL, NULL, 100000, DEATH_SHOOTING_STAR.m_id, DMG_NOWEP, this.origin, '0 0 0');
 }
 
@@ -243,6 +253,7 @@ void StartFrame()
 	anticheat_startframe();
 	MUTATOR_CALLHOOK(SV_StartFrame);
 
+	GlobalStats_updateglobal();
     FOREACH_CLIENT(true, GlobalStats_update(it));
     IL_EACH(g_players, IS_FAKE_CLIENT(it), PlayerPostThink(it));
 }