From 6216b3350c1337ceb44a435580002c425af27424 Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 24 Oct 2009 17:19:53 +0000 Subject: [PATCH] follow: fix logic of src/dst checking git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8181 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/g_triggers.qc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/server/g_triggers.qc b/data/qcsrc/server/g_triggers.qc index f9a0566cd..7844dcb23 100644 --- a/data/qcsrc/server/g_triggers.qc +++ b/data/qcsrc/server/g_triggers.qc @@ -1410,10 +1410,14 @@ void spawnfunc_trigger_multivibrator() 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 @@ void follow_init() self.aiment = src; self.enemy = dst; } + else if(!src || !dst) + { + objerror("follow: could not find target/killtarget"); + return; + } else if(self.spawnflags & 1) { // attach -- 2.39.2