X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Feffects%2Fqc%2Fdamageeffects.qc;h=71e1e2a7bcdd96dcf3f72629d7e147d4db03aab3;hb=c039d054a46888048d214000273ccfc63e4611b6;hp=c1144d2616c9b58991d5d6e5d5c1af89b340314e;hpb=3220cab5a7b69ced4a641504a6a5f4eccf2d3bfc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/effects/qc/damageeffects.qc b/qcsrc/common/effects/qc/damageeffects.qc
index c1144d261..71e1e2a7b 100644
--- a/qcsrc/common/effects/qc/damageeffects.qc
+++ b/qcsrc/common/effects/qc/damageeffects.qc
@@ -1,15 +1,4 @@
-#ifndef DAMAGEEFFECTS_H
-#define DAMAGEEFFECTS_H
-
-#ifdef CSQC
-#include <common/deathtypes/all.qh>
-#include <common/physics/movetypes/movetypes.qh>
-#include <client/mutators/events.qh>
-#include <common/vehicles/all.qh>
-#include <common/weapons/all.qh>
-#endif
-
-#endif
+#include "damageeffects.qh"
 
 #ifdef IMPLEMENTATION
 
@@ -81,7 +70,7 @@ void DamageEffect_Think(entity this)
 	{
 		// time is up or the player got gibbed / disconnected
 		this.owner.total_damages = max(0, this.owner.total_damages - 1);
-		remove(this);
+		delete(this);
 		return;
 	}
 	if(this.state && !this.owner.csqcmodel_isdead)
@@ -89,7 +78,7 @@ void DamageEffect_Think(entity this)
 		// if the player was dead but is now alive, it means he respawned
 		// if so, clear his damage effects, or damages from his dead body will be copied back
 		this.owner.total_damages = max(0, this.owner.total_damages - 1);
-		remove(this);
+		delete(this);
 		return;
 	}
 	this.state = this.owner.csqcmodel_isdead;
@@ -255,8 +244,8 @@ NET_HANDLE(ENT_CLIENT_DAMAGEINFO, bool isNew)
 		if(it.damageforcescale)
 			if(vdist(thisforce, !=, 0))
 			{
-				it.move_velocity = it.move_velocity + damage_explosion_calcpush(it.damageforcescale * thisforce, it.move_velocity, autocvar_g_balance_damagepush_speedfactor);
-				it.move_flags &= ~FL_ONGROUND;
+				it.velocity = it.velocity + damage_explosion_calcpush(it.damageforcescale * thisforce, it.velocity, autocvar_g_balance_damagepush_speedfactor);
+				UNSET_ONGROUND(it);
 			}
 
 		if(w_issilent)