X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Fmisc%2Flaser.qc;h=06ca7054352696b92061a23a1ce3aa52ce61acb3;hb=c51698509e174e343dff48128a1dcfff1527c535;hp=52d2caf65aada325c89e45404952dc4dde407b90;hpb=120ad19fdf46b7096a0f90b940e590f1909ad22c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/misc/laser.qc b/qcsrc/common/triggers/misc/laser.qc
index 52d2caf65a..06ca705435 100644
--- a/qcsrc/common/triggers/misc/laser.qc
+++ b/qcsrc/common/triggers/misc/laser.qc
@@ -1,9 +1,8 @@
 #if defined(CSQC)
-	#include "../../../client/_all.qh"
-	#include "../../buffs.qh"
-	#include "../../../csqcmodellib/interpolate.qh"
+	#include "../../buffs/all.qh"
+	#include "../../../lib/csqcmodel/interpolate.qh"
 	#include "../../../client/main.qh"
-	#include "../../../csqcmodellib/cl_model.qh"
+	#include "../../../lib/csqcmodel/cl_model.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
 #endif
@@ -119,12 +118,12 @@ void misc_laser_think()
 			if(((self.spawnflags & 8) == 0) == (self.team != hitent.team))
 				return;
 		if(hitent.takedamage)
-			Damage(hitent, self, self, ((self.dmg < 0) ? 100000 : (self.dmg * frametime)), DEATH_HURTTRIGGER, hitloc, '0 0 0');
+			Damage(hitent, self, self, ((self.dmg < 0) ? 100000 : (self.dmg * frametime)), DEATH_HURTTRIGGER.m_id, hitloc, '0 0 0');
 	}
 }
 
-float laser_SendEntity(entity to, float fl)
-{SELFPARAM();
+bool laser_SendEntity(entity this, entity to, float fl)
+{
 	WriteByte(MSG_ENTITY, ENT_CLIENT_LASER);
 	fl = fl - (fl & 0xF0); // use that bit to indicate finite length laser
 	if(self.spawnflags & 2)
@@ -203,8 +202,8 @@ void laser_reset()
 		self.state = 0;
 }
 
-void spawnfunc_misc_laser()
-{SELFPARAM();
+spawnfunc(misc_laser)
+{
 	if(self.mdl)
 	{
 		if(self.mdl == "none")
@@ -272,8 +271,8 @@ class(Laser) .float alpha;
 class(Laser) .float scale; // scaling factor of the thickness
 class(Laser) .float modelscale; // scaling factor of the dlight
 
-void Draw_Laser()
-{SELFPARAM();
+void Draw_Laser(entity this)
+{
 	if(!self.state)
 		return;
 	InterpolateOrigin_Do();