[nexuiz-commits] r8181 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Oct 24 13:19:54 EDT 2009
Author: div0
Date: 2009-10-24 13:19:53 -0400 (Sat, 24 Oct 2009)
New Revision: 8181
Modified:
trunk/data/qcsrc/server/g_triggers.qc
Log:
follow: fix logic of src/dst checking
Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc 2009-10-24 17:19:30 UTC (rev 8180)
+++ trunk/data/qcsrc/server/g_triggers.qc 2009-10-24 17:19:53 UTC (rev 8181)
@@ -1410,10 +1410,14 @@
void follow_init()
{
entity src, dst;
- src = find(world, targetname, self.killtarget);
- dst = find(world, targetname, self.target);
+ src = world;
+ dst = world;
+ if(self.killtarget != "")
+ src = find(world, targetname, self.killtarget);
+ if(self.target != "")
+ dst = find(world, targetname, self.target);
- if(!src || !dst)
+ if(!src && !dst)
{
objerror("follow: could not find target/killtarget");
return;
@@ -1425,6 +1429,11 @@
self.aiment = src;
self.enemy = dst;
}
+ else if(!src || !dst)
+ {
+ objerror("follow: could not find target/killtarget");
+ return;
+ }
else if(self.spawnflags & 1)
{
// attach
More information about the nexuiz-commits
mailing list