update .ent file too

diff --git a/scripts/entities.def2ent b/scripts/entities.def2ent
index bf94710832ef9121c049e41b9685cf9eb1873bb2..2ade9938cc32fc38831d1df2dc9485c94aadfbe8 100755 (executable)
--- 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 f5179a301f05d3e8f91ef04369dff197394b34d4..192c687cb118bc2261ce0f37bbc718539756799c 100644 (file)
--- 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 --------