Merge branch 'TimePath/globalforces' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / spawnpoints.qc

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index 21112d93f3e55f1063723dcdc463b5b4c4f265b5..958b0bd6e3a7c7ddf8ebefced698652592d80f19 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -252,20 +252,20 @@ vector Spawn_Score(entity this, entity spot, float mindist, float teamcheck)
        if(spot.target != "")
        {
                int found = 0;
-               FOREACH_ENTITY_STRING(targetname, spot.target,
+               for(entity targ = findchain(targetname, spot.target); targ; targ = targ.chain)
                {
                        ++found;
-                       if(it.spawn_evalfunc)
+                       if(targ.spawn_evalfunc)
                        {
-                               spawn_score = it.spawn_evalfunc(it, this, spot, spawn_score);
+                               spawn_score = targ.spawn_evalfunc(targ, this, spot, spawn_score);
                                if(spawn_score.x < 0)
                                        return spawn_score;
                        }
-               });
+               }
 
                if(!found)
                {
-                       LOG_TRACE("WARNING: spawnpoint at ", vtos(spot.origin), " could not find its target ", spot.target, "\n");
+                       LOG_TRACE("WARNING: spawnpoint at ", vtos(spot.origin), " could not find its target ", spot.target);
                        return '-1 0 0';
                }
        }