From 6b67fe94d769ba35511446b032ef8335609e9f66 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 24 Aug 2019 18:24:46 +1000 Subject: [PATCH] Don't link teleporter destinations to CSQC if they aren't targeted --- qcsrc/common/mapobjects/misc/teleport_dest.qc | 3 +++ qcsrc/common/mapobjects/teleporters.qc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/qcsrc/common/mapobjects/misc/teleport_dest.qc b/qcsrc/common/mapobjects/misc/teleport_dest.qc index 126a20ea26..e7eedd52c4 100644 --- a/qcsrc/common/mapobjects/misc/teleport_dest.qc +++ b/qcsrc/common/mapobjects/misc/teleport_dest.qc @@ -43,7 +43,10 @@ spawnfunc(info_teleport_destination) { } else + { objerror (this, "^3Teleport destination without a targetname"); + return; // don't link it to CSQC in this case! + } teleport_dest_link(this); } diff --git a/qcsrc/common/mapobjects/teleporters.qc b/qcsrc/common/mapobjects/teleporters.qc index 339ade52a7..da86cabce8 100644 --- a/qcsrc/common/mapobjects/teleporters.qc +++ b/qcsrc/common/mapobjects/teleporters.qc @@ -257,7 +257,7 @@ void teleport_findtarget(entity this) if(n == 0) { // no dest! - objerror (this, "Teleporter with nonexistant target"); + objerror (this, "Teleporter with nonexistent target"); return; } else if(n == 1) -- 2.39.2