vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

make_mapdef.sh/trigger_changetarget: Minor fixes.

Browse source
This commit is contained in:
Marco Cawthorne 2024-02-19 13:23:46 -08:00
parent 0df1e78cc3
commit 08259f5652
Signed by: eukara
GPG key ID: CE2032F0A2882A22
3 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/EntityGuide.md
View file

@ -148,6 +148,8 @@
[func_tankmortar](@ref func_tankmortar)
[func_trackchange](@ref func_trackchange)
[func_tracktrain](@ref func_tracktrain)
[func_train](@ref func_train)

24
make_mapdef.sh
View file

@ -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"

5
src/gs-entbase/server/trigger_changetarget.qc
View file

@ -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);