X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=cd4693a2bdfbed24c6a0d2b2880c28e0726e96d6;hp=9be3c18f6017183f8d81319e0cdb75e4a2d16e51;hb=d7822b48dc834b170a7487609cfe925e29702dfc;hpb=306d846b2583c3d4346c120725f8506a79af47f8

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 9be3c18f60..cd4693a2bd 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -28,44 +28,43 @@
 #include "../lib/warpzone/common.qh"
 #include "../lib/warpzone/server.qh"
 
-.float lastground;
-.int state;
-
 void CreatureFrame_hotliquids(entity this)
 {
-	if (this.dmgtime < time)
+	if (this.dmgtime >= time)
 	{
-		this.dmgtime = time + autocvar_g_balance_contents_damagerate;
+		return;
+	}
 
-		if (this.flags & FL_PROJECTILE)
-		{
-			if (this.watertype == CONTENT_LAVA)
-				Damage (this, NULL, NULL, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_LAVA.m_id, DMG_NOWEP, this.origin, '0 0 0');
-			else if (this.watertype == CONTENT_SLIME)
-				Damage (this, NULL, NULL, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_SLIME.m_id, DMG_NOWEP, this.origin, '0 0 0');
-		}
-		else
+	this.dmgtime = time + autocvar_g_balance_contents_damagerate;
+
+	if (this.flags & FL_PROJECTILE)
+	{
+		if (this.watertype == CONTENT_LAVA)
+			Damage (this, NULL, NULL, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_LAVA.m_id, DMG_NOWEP, this.origin, '0 0 0');
+		else if (this.watertype == CONTENT_SLIME)
+			Damage (this, NULL, NULL, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_SLIME.m_id, DMG_NOWEP, this.origin, '0 0 0');
+	}
+	else
+	{
+		if (this.watertype == CONTENT_LAVA)
 		{
-			if (this.watertype == CONTENT_LAVA)
+			if (this.watersound_finished < time)
 			{
-				if (this.watersound_finished < time)
-				{
-					this.watersound_finished = time + 0.5;
-					sound (this, CH_PLAYER_SINGLE, SND_LAVA, VOL_BASE, ATTEN_NORM);
-				}
-				Damage (this, NULL, NULL, autocvar_g_balance_contents_playerdamage_lava * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_LAVA.m_id, DMG_NOWEP, this.origin, '0 0 0');
-				if(autocvar_g_balance_contents_playerdamage_lava_burn)
-					Fire_AddDamage(this, NULL, autocvar_g_balance_contents_playerdamage_lava_burn * this.waterlevel, autocvar_g_balance_contents_playerdamage_lava_burn_time * this.waterlevel, DEATH_LAVA.m_id);
+				this.watersound_finished = time + 0.5;
+				sound (this, CH_PLAYER_SINGLE, SND_LAVA, VOL_BASE, ATTEN_NORM);
 			}
-			else if (this.watertype == CONTENT_SLIME)
+			Damage (this, NULL, NULL, autocvar_g_balance_contents_playerdamage_lava * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_LAVA.m_id, DMG_NOWEP, this.origin, '0 0 0');
+			if(autocvar_g_balance_contents_playerdamage_lava_burn)
+				Fire_AddDamage(this, NULL, autocvar_g_balance_contents_playerdamage_lava_burn * this.waterlevel, autocvar_g_balance_contents_playerdamage_lava_burn_time * this.waterlevel, DEATH_LAVA.m_id);
+		}
+		else if (this.watertype == CONTENT_SLIME)
+		{
+			if (this.watersound_finished < time)
 			{
-				if (this.watersound_finished < time)
-				{
-					this.watersound_finished = time + 0.5;
-					sound (this, CH_PLAYER_SINGLE, SND_SLIME, VOL_BASE, ATTEN_NORM);
-				}
-				Damage (this, NULL, NULL, autocvar_g_balance_contents_playerdamage_slime * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_SLIME.m_id, DMG_NOWEP, this.origin, '0 0 0');
+				this.watersound_finished = time + 0.5;
+				sound (this, CH_PLAYER_SINGLE, SND_SLIME, VOL_BASE, ATTEN_NORM);
 			}
+			Damage (this, NULL, NULL, autocvar_g_balance_contents_playerdamage_slime * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_SLIME.m_id, DMG_NOWEP, this.origin, '0 0 0');
 		}
 	}
 }
@@ -96,35 +95,44 @@ void CreatureFrame_Liquids(entity this)
 
 void CreatureFrame_FallDamage(entity this)
 {
-	if(!IS_VEHICLE(this) && !(this.flags & FL_PROJECTILE)) // vehicles don't get falling damage
-	if(this.velocity || this.oldvelocity) // moving or has moved
+	if(IS_VEHICLE(this) || (this.flags & FL_PROJECTILE))
+		return; // vehicles and projectiles don't receive fall damage
+	if(!(this.velocity || this.oldvelocity))
+		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)
 	{
-		// check for falling damage
-		float velocity_len = vlen(this.velocity);
-		bool have_hook = false;
-		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+	    .entity weaponentity = weaponentities[slot];
+	    if(this.(weaponentity).hook && this.(weaponentity).hook.state)
 	    {
-	    	.entity weaponentity = weaponentities[slot];
-	    	if(this.(weaponentity).hook && this.(weaponentity).hook.state)
-	    	{
-	    		have_hook = true;
-	    		break;
-	    	}
+	    	have_hook = true;
+	    	break;
 	    }
-		if(!have_hook)
+	}
+	if(!have_hook)
+	{
+		float dm;
+		if(autocvar_g_balance_falldamage_onlyvertical)
+			dm = vlen('0 0 1' * this.oldvelocity.z) - vlen('0 0 1' * this.velocity.z);
+		else
+			dm = vlen(this.oldvelocity) - velocity_len; // dm is now the velocity DECREASE. Velocity INCREASE should never cause a sound or any damage.
+		if (IS_DEAD(this))
+			dm = (dm - autocvar_g_balance_falldamage_deadminspeed) * autocvar_g_balance_falldamage_factor;
+		else
+			dm = min((dm - autocvar_g_balance_falldamage_minspeed) * autocvar_g_balance_falldamage_factor, autocvar_g_balance_falldamage_maxdamage);
+		if (dm > 0)
 		{
-			float dm = vlen(this.oldvelocity) - velocity_len; // dm is now the velocity DECREASE. Velocity INCREASE should never cause a sound or any damage.
-			if (IS_DEAD(this))
-				dm = (dm - autocvar_g_balance_falldamage_deadminspeed) * autocvar_g_balance_falldamage_factor;
-			else
-				dm = min((dm - autocvar_g_balance_falldamage_minspeed) * autocvar_g_balance_falldamage_factor, autocvar_g_balance_falldamage_maxdamage);
-			if (dm > 0)
+			tracebox(this.origin, this.mins, this.maxs, this.origin - '0 0 1', MOVE_NOMONSTERS, this);
+			if (!(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NODAMAGE))
 				Damage (this, NULL, NULL, dm, DEATH_FALL.m_id, DMG_NOWEP, this.origin, '0 0 0');
 		}
-
-		if(autocvar_g_maxspeed > 0 && velocity_len > autocvar_g_maxspeed)
-			Damage (this, NULL, NULL, 100000, DEATH_SHOOTING_STAR.m_id, DMG_NOWEP, this.origin, '0 0 0');
 	}
+
+	if(autocvar_g_maxspeed > 0 && velocity_len > autocvar_g_maxspeed)
+		Damage (this, NULL, NULL, 100000, DEATH_SHOOTING_STAR.m_id, DMG_NOWEP, this.origin, '0 0 0');
 }
 
 void CreatureFrame_All()
@@ -324,14 +332,17 @@ void SV_OnEntityPreSpawnFunction(entity this)
 	if (this.gametypefilter != "")
 	if (!isGametypeInFilter(MapInfo_LoadedGametype, teamplay, have_team_spawns, this.gametypefilter))
 	{
-		goto cleanup;
+		delete(this);
+		return;
 	}
 	if (this.cvarfilter != "" && !expr_evaluate(this.cvarfilter)) {
-        goto cleanup;
+		delete(this);
+		return;
 	}
 
 	if (DoesQ3ARemoveThisEntity(this)) {
-		goto cleanup;
+		delete(this);
+		return;
 	}
 
 	set_movetype(this, this.movetype);
@@ -356,11 +367,9 @@ void SV_OnEntityPreSpawnFunction(entity this)
     #undef X
 
 	if (MUTATOR_CALLHOOK(OnEntityPreSpawn, this)) {
-		goto cleanup;
+		delete(this);
+		return;
 	}
-	return;
-LABEL(cleanup)
-    delete(this);
 }
 
 void WarpZone_PostInitialize_Callback()