From 08259f56529c3bb7642be8a6eb0f513198ee677d Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Mon, 19 Feb 2024 13:23:46 -0800
Subject: [PATCH] make_mapdef.sh/trigger_changetarget: Minor fixes.

---
 Documentation/EntityGuide.md                  |  2 ++
 make_mapdef.sh                                | 24 +++++++++----------
 src/gs-entbase/server/trigger_changetarget.qc |  5 ++--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Documentation/EntityGuide.md b/Documentation/EntityGuide.md
index c4002833..e03bcef8 100644
--- a/Documentation/EntityGuide.md
+++ b/Documentation/EntityGuide.md
@@ -148,6 +148,8 @@
 
 [func_tankmortar](@ref func_tankmortar)
 
+[func_trackchange](@ref func_trackchange)
+
 [func_tracktrain](@ref func_tracktrain)
 
 [func_train](@ref func_train)
diff --git a/make_mapdef.sh b/make_mapdef.sh
index 64d63889..9b58bf35 100755
--- a/make_mapdef.sh
+++ b/make_mapdef.sh
@@ -15,8 +15,8 @@ printf -- "" > "/tmp/def_model"
 do
 	SEG1=$(echo "$LINE" | awk '{ print $1 }')
 	SEG2=$(echo "$LINE" | awk '{ print $2 }')
-	KEY=$(echo "$LINE" | awk -F"\"" '{ print $2 }')
-	VAL=$(echo "$LINE" | awk -F"\"" '{ print $4 }')
+	KEY="$(echo "$LINE" | awk -F"\"" '{ print $2 }')"
+	VAL="$(echo "$LINE" | awk -F"\"" '{ print $4 }')"
 
 	if [ "$KEY" = "entityDef" ]
 	then
@@ -45,7 +45,7 @@ do
 
 	if [ "$KEY" = "mins" ]
 	then
-		if [ -z $(cat "/tmp/def_mins") ]
+		if [ -z "$(cat /tmp/def_mins)" ]
 		then
 			printf -- "$VAL" > "/tmp/def_mins"
 		fi
@@ -53,7 +53,7 @@ do
 
 	if [ "$KEY" = "maxs" ]
 	then
-		if [ -z $(cat "/tmp/def_maxs") ]
+		if [ -z "$(cat /tmp/def_maxs)" ]
 		then
 			printf -- "$VAL" > "/tmp/def_maxs"
 		fi
@@ -66,7 +66,7 @@ do
 
 	if [ "$KEY" = "netname" ]
 	then
-		if [ -z "$(cat "/tmp/def_usage")" ]
+		if [ -z "$(cat /tmp/def_usage)" ]
 		then
 			printf -- "$VAL" > "/tmp/def_usage"
 		fi
@@ -79,7 +79,7 @@ do
 
 	if [ "$KEY" = "model" ]
 	then
-		if [ -z $(cat "/tmp/def_model") ]
+		if [ -z "$(cat /tmp/def_model)" ]
 		then
 			printf -- "$VAL" > "/tmp/def_model"
 		fi
@@ -87,12 +87,12 @@ do
 
 	if [ "$SEG1" = "}" ]
 	then
-		KEY_NAME=$(cat "/tmp/def_name")
-		KEY_COLOR=$(cat "/tmp/def_color")
-		KEY_MINS=$(cat "/tmp/def_mins")
-		KEY_MAXS=$(cat "/tmp/def_maxs")
-		KEY_USAGE=$(cat "/tmp/def_usage")
-		KEY_MODEL=$(cat "/tmp/def_model")
+		KEY_NAME="$(cat /tmp/def_name)"
+		KEY_COLOR="$(cat /tmp/def_color)"
+		KEY_MINS="$(cat /tmp/def_mins)"
+		KEY_MAXS="$(cat /tmp/def_maxs)"
+		KEY_USAGE="$(cat /tmp/def_usage)"
+		KEY_MODEL="$(cat /tmp/def_model)"
 		printf -- "" > "/tmp/def_name"
 		printf -- "" > "/tmp/def_color"
 		printf -- "" > "/tmp/def_mins"
diff --git a/src/gs-entbase/server/trigger_changetarget.qc b/src/gs-entbase/server/trigger_changetarget.qc
index b3033b9d..969320ec 100644
--- a/src/gs-entbase/server/trigger_changetarget.qc
+++ b/src/gs-entbase/server/trigger_changetarget.qc
@@ -84,10 +84,9 @@ trigger_changetarget::Trigger(entity act, triggermode_t state)
 {
 	NSEntity f;
 
-	f = (NSEntity)find(world, ::targetname, target);
+	for (f = __NULL__; (f = (NSEntity)find(f, ::targetname, target));) {
 
-	if (f) {
-		dprint("^2trigger_changetarget::^3Trigger^7: " \
+		NSLog("^2trigger_changetarget::^3Trigger^7: " \
 		       "Changing %s (%s) target from '%s' to '%s'\n", \
 		       target, f.classname, f.target, target);