r4231 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Fri Aug 29 04:43:10 EDT 2008


Author: div0
Date: 2008-08-29 04:43:04 -0400 (Fri, 29 Aug 2008)
New Revision: 4231

Modified:
   trunk/data/qcsrc/server/g_triggers.qc
Log:
more fixes to the laser


Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2008-08-29 08:27:36 UTC (rev 4230)
+++ trunk/data/qcsrc/server/g_triggers.qc	2008-08-29 08:43:04 UTC (rev 4231)
@@ -730,6 +730,14 @@
 			}
 		}
 	}
+	else
+	{
+		if(self.angles != self.mangle)
+		{
+			self.mangle = self.angles;
+			self.SendFlags |= 2;
+		}
+	}
 	if(self.origin != self.oldorigin)
 	{
 		self.SendFlags |= 1;
@@ -739,7 +747,8 @@
 
 void misc_laser_init()
 {
-	self.enemy = find(world, targetname, self.target);
+	if(self.target != "")
+		self.enemy = find(world, targetname, self.target);
 }
 
 void misc_laser_think()
@@ -753,9 +762,17 @@
 
 	misc_laser_aim();
 
-	o = self.enemy.origin;
-	if not(self.spawnflags & 2)
-		o = self.origin + normalize(o - self.origin) * 32768;
+	if(self.enemy)
+	{
+		o = self.enemy.origin;
+		if not(self.spawnflags & 2)
+			o = self.origin + normalize(o - self.origin) * 32768;
+	}
+	else
+	{
+		makevectors(self.mangle);
+		o = self.origin + v_forward * 32768;
+	}
 
 	if(self.dmg)
 	{
@@ -854,6 +871,7 @@
 	self.SendFlags = 15;
 	self.modelindex = 1;
 	self.model = "net_entity";
+	self.mangle = self.angles;
 
 	IFTARGETED
 	{




More information about the nexuiz-commits mailing list