From: Mario <mario@smbclan.net>
Date: Wed, 7 Feb 2018 15:12:04 +0000 (+1000)
Subject: Fix trigger_viewlocation and add target_spawnpoint
X-Git-Tag: xonotic-v0.8.5~137
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=65ad5cfd9a47610d4ed4cd8af090079f5fca3abe;p=xonotic%2Fxonotic-maps.pk3dir.git

Fix trigger_viewlocation and add target_spawnpoint
---

diff --git a/scripts/entities.ent b/scripts/entities.ent
index 46382261..bb7bbdb0 100644
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -434,6 +434,12 @@ Pink team's player spawning location, but there is no game mode to use this yet.
 <real key="restriction" name="restriction">when 1, only bots can spawn here; when 2, only humans can spawn here (be careful with these, or the game will crash because someone cannot spawn)</real>
 </point>
 
+<point name="target_spawnpoint" color=".5 .5 .5" box="-16 -16 -24 16 16 45">
+Acts as a checkpoint to re-spawn at
+-------- KEYS --------
+<targetname key="targetname" name="targetname">when targeted, this will set the activator's spawn point temporarily to this entity. It is reset upon re-spawn.</targetname>
+</point>
+
 <point name="item_armor_mega" color=".4 .8 .4" box="-30 -30 0 30 30 32">
 Large Armor (default 100 armor points)
 -------- KEYS --------
@@ -1610,7 +1616,7 @@ Triggers once when the game starts, then no longer does anything.
 <real key="wait" name="wait">wait so many seconds before triggering</real>
 </point>
 
-<point name="trigger_viewlocation" color=".5 .5 .5" box="-8 -8 -8 8 8 8">
+<group name="trigger_viewlocation" color=".5 .5 .5" box="-8 -8 -8 8 8 8">
 A brush that when entered changes the player's view to a position between target and target2, useful for side-scrolling stages
 -------- KEYS --------
 <target key="target" name="target">should point to a target_viewlocation_start entity</target>
@@ -1619,7 +1625,7 @@ A brush that when entered changes the player's view to a position between target
 <flag key="NOSIDESCROLL" name="NOSIDESCROLL" bit="0">allow regular aiming and movement while forcing the camera between the viewlocation points</flag>
 <flag key="FREEAIM" name="FREEAIM" bit="1">show a crosshair on screen and allow 2d aiming instead of only forward</flag>
 <flag key="FREEMOVE" name="FREEMOVE" bit="2">allow moving up and down as well in side-scrolling mode, useful for brawlers</flag>
-</point>
+</group>
 
 <point name="target_viewlocation_start" color="0 .5 0" box="-8 -8 -8 8 8 8">
 Starting position for the area of viewing in a view location area, viewing position is bounded between this and a target_viewlocation_end