From fc0d1def40fb57ec323276b161e832d7902d67b6 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer <divVerent@xonotic.org> Date: Fri, 2 Sep 2011 17:00:24 +0200 Subject: [PATCH] update .ent file too --- scripts/entities.def2ent | 2 +- scripts/entities.ent | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/entities.def2ent b/scripts/entities.def2ent index bf947108..2ade9938 100755 --- a/scripts/entities.def2ent +++ b/scripts/entities.def2ent @@ -11,7 +11,7 @@ open my $fh, '<', '../../xonotic-data.pk3dir/qcsrc/server/qc.asm' while(<$fh>) { chomp; - if(/^\.(\w+) (\w+);$/) + if(/^\.(\w+) (\w+);(?: \/\* at .* \*\/)$/) { if($1 eq "float") { diff --git a/scripts/entities.ent b/scripts/entities.ent index f5179a30..192c687c 100644 --- a/scripts/entities.ent +++ b/scripts/entities.ent @@ -1933,12 +1933,12 @@ Should target a target_position, or be targeted by a misc_warpzone_position. Should be thick enough to fit a player entity (i.e. 32 units), preferably even thicker. -------- KEYS -------- <target key="target" name="target">must point to another trigger_warpzone, or...</target> +<targetname key="targetname" name="targetname">must be pointed to by another trigger_warpzone. Should be pointed to by a misc_warpzone_position entity, or...</targetname> +<target key="killtarget" name="killtarget">should point to a target_position entity.</target> <target key="target2" name="target2">is triggered when a player ENTERS the warpzone (and warps away)</target> <target key="target3" name="target3">is triggered when a player LEAVES the warpzone (from the other warp zone to this one)</target> <target key="target4" name="target4">is triggered in both cases</target> <boolean key="target_random" name="target_random">instead of triggering ALL matched entities, trigger ONE of them by random</boolean> -<targetname key="targetname" name="targetname">must be pointed to by another trigger_warpzone. Should be pointed to by a misc_warpzone_position entity, or...</targetname> -<target key="killtarget" name="killtarget">should point to a target_position entity, or</target> <real key="warpzone_fadestart" name="warpzone_fadestart">start distance of fading out the warpzone</real> <real key="warpzone_fadeend" name="warpzone_fadeend">end distance of fading out the warpzone (if viewer is further, warpzone is not rendered at all)</real> -------- SPAWNFLAGS -------- -- 2.39.5