X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Futil.qc;h=3d6d95a76a42504e5dda204de447114867890ea1;hp=6de59027e38bdc668a9071f398a9bb1955cc73d9;hb=82dbcadfd0556053b74638f2e3ae2e57103ddf26;hpb=7f6f6ddf5a60125f13cbc906c5e29faf61310d80

diff --git a/qcsrc/common/turrets/util.qc b/qcsrc/common/turrets/util.qc
index 6de59027e3..3d6d95a76a 100644
--- a/qcsrc/common/turrets/util.qc
+++ b/qcsrc/common/turrets/util.qc
@@ -113,20 +113,19 @@ vector angleofs3(vector from, vector from_a, entity to)
 * Update self.tur_shotorg by getting up2date bone info
 * NOTICE this func overwrites the global v_forward, v_right and v_up vectors.
 */
-#define turret_tag_fire_update() self.tur_shotorg = gettaginfo(self.tur_head, gettagindex(self.tur_head, "tag_fire"));v_forward = normalize(v_forward)
-float turret_tag_fire_update_s()
+float turret_tag_fire_update()
 {
 	if(!self.tur_head)
 	{
 		error("Call to turret_tag_fire_update with self.tur_head missing!\n");
 		self.tur_shotorg = '0 0 0';
-		return FALSE;
+		return false;
 	}
 
 	self.tur_shotorg = gettaginfo(self.tur_head, gettagindex(self.tur_head, "tag_fire"));
 	v_forward = normalize(v_forward);
 
-	return TRUE;
+	return true;
 }
 
 /*
@@ -149,7 +148,7 @@ void FireImoBeam (vector start, vector end, vector smin, vector smax,
 	// note down which entities were hit so we can damage them later
 	while (1)
 	{
-		tracebox(start, smin, smax, end, FALSE, self);
+		tracebox(start, smin, smax, end, false, self);
 
 		// if it is world we can't hurt it so stop now
 		if (trace_ent == world || trace_fraction == 1)
@@ -159,7 +158,7 @@ void FireImoBeam (vector start, vector end, vector smin, vector smax,
 			break;
 
 		// make the entity non-solid so we can hit the next one
-		trace_ent.railgunhit = TRUE;
+		trace_ent.railgunhit = true;
 		trace_ent.railgunhitloc = end;
 		trace_ent.railgunhitsolidbackup = trace_ent.solid;
 
@@ -172,23 +171,23 @@ void FireImoBeam (vector start, vector end, vector smin, vector smax,
 	endpoint = trace_endpos;
 
 	// find all the entities the railgun hit and restore their solid state
-	ent = findfloat(world, railgunhit, TRUE);
+	ent = findfloat(world, railgunhit, true);
 	while (ent)
 	{
 		// restore their solid type
 		ent.solid = ent.railgunhitsolidbackup;
-		ent = findfloat(ent, railgunhit, TRUE);
+		ent = findfloat(ent, railgunhit, true);
 	}
 
 	// find all the entities the railgun hit and hurt them
-	ent = findfloat(world, railgunhit, TRUE);
+	ent = findfloat(world, railgunhit, true);
 	while (ent)
 	{
 		// get the details we need to call the damage function
 		hitloc = ent.railgunhitloc;
 		ent.railgunhitloc = '0 0 0';
 		ent.railgunhitsolidbackup = SOLID_NOT;
-		ent.railgunhit = FALSE;
+		ent.railgunhit = false;
 
 		// apply the damage
 		if (ent.takedamage)
@@ -199,7 +198,7 @@ void FireImoBeam (vector start, vector end, vector smin, vector smax,
 		}
 
 		// advance to the next entity
-		ent = findfloat(ent, railgunhit, TRUE);
+		ent = findfloat(ent, railgunhit, true);
 	}
 	trace_endpos = endpoint;
 }