From 71469375e697604e0cc4bf768971e444c5dae66c Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 14 Sep 2018 03:41:21 +1000 Subject: [PATCH] Don't nullify .target on the spawnpoint when spawning, fixes compatibility with Quake 3 defrag maps (unsure if this causes any breakage - race and assault still work) --- qcsrc/server/client.qc | 6 +++--- qcsrc/server/spawnpoints.qc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 8b70a633a..045d00150 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -721,10 +721,10 @@ void PutPlayerInServer(entity this) }); { - string s = spot.target; - spot.target = string_null; + //string s = spot.target; + //spot.target = string_null; SUB_UseTargets(spot, this, NULL); - spot.target = s; + //spot.target = s; } Unfreeze(this); diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc index e0e33e480..03b40c5e1 100644 --- a/qcsrc/server/spawnpoints.qc +++ b/qcsrc/server/spawnpoints.qc @@ -248,7 +248,7 @@ vector Spawn_Score(entity this, entity spot, float mindist, float teamcheck) vector spawn_score = prio * '1 0 0' + shortest * '0 1 0'; // filter out spots for assault - if(spot.target != "") + if(spot.target && spot.target != "") { int found = 0; for(entity targ = findchain(targetname, spot.target); targ; targ = targ.chain) -- 2.39.2