]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Don't nullify .target on the spawnpoint when spawning, fixes compatibility with Quake...
authorMario <zacjardine@y7mail.com>
Thu, 13 Sep 2018 17:41:21 +0000 (03:41 +1000)
committerMario <zacjardine@y7mail.com>
Thu, 13 Sep 2018 17:41:21 +0000 (03:41 +1000)
qcsrc/server/client.qc
qcsrc/server/spawnpoints.qc

index 8b70a633af9ebc59a394e1093684a34d852d7470..045d00150b12dcbe1c2ab7090d32c9949a424d9f 100644 (file)
@@ -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);
index e0e33e4803c87445641359a8c76824cc821a19a8..03b40c5e12864aa7570c19ff0169c0ec107162b2 100644 (file)
@@ -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)