Wrap some statuses with parentesis to avoid possible obscure bugs

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapobjects / trigger / viewloc.qc

diff --git a/qcsrc/common/mapobjects/trigger/viewloc.qc b/qcsrc/common/mapobjects/trigger/viewloc.qc
index ba5dcbe443ea4c26e955adfa68b9f997eb0f8d69..eb3ae7f4b67e6ba3a07ee3b1d1c9d6dc271e7c8b 100644 (file)
--- a/qcsrc/common/mapobjects/trigger/viewloc.qc
+++ b/qcsrc/common/mapobjects/trigger/viewloc.qc
@@ -3,7 +3,9 @@
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include <lib/warpzone/util_server.qh>
-    #include <server/defs.qh>
+       #include <common/mapobjects/triggers.qh>
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
 #endif
 
 REGISTER_NET_LINKED(ENT_CLIENT_VIEWLOC)
@@ -113,7 +115,7 @@ spawnfunc(trigger_viewlocation)
        // we won't check target2 here yet, as it may not even need to exist
        if(this.target == "") { LOG_INFO("^1FAIL!"); delete(this); return; }
 
-       EXACTTRIGGER_INIT;
+       WarpZoneLib_ExactTrigger_Init(this, false);
        InitializeEntity(this, viewloc_init, INITPRIO_FINDTARGET);
 }
 
@@ -125,9 +127,7 @@ bool viewloc_send(entity this, entity to, int sf)
 
        WriteVector(MSG_ENTITY, this.origin);
 
-       WriteAngle(MSG_ENTITY, this.angles_x);
-       WriteAngle(MSG_ENTITY, this.angles_y);
-       WriteAngle(MSG_ENTITY, this.angles_z);
+       WriteAngleVector(MSG_ENTITY, this.angles);
 
        return true;
 }
@@ -142,13 +142,11 @@ void viewloc_link(entity this)
 
 spawnfunc(target_viewlocation_start)
 {
-       this.classname = "target_viewlocation_start";
        this.cnt = 1;
        viewloc_link(this);
 }
 spawnfunc(target_viewlocation_end)
 {
-       this.classname = "target_viewlocation_end";
        this.cnt = 2;
        viewloc_link(this);
 }
@@ -189,7 +187,6 @@ NET_HANDLE(ENT_CLIENT_VIEWLOC_TRIGGER, bool isnew)
        setthink(this, trigger_viewloc_updatelink);
        this.nextthink = time + 1; // we need to delay this or else
 
-       this.classname = "trigger_viewlocation";
        this.drawmask = MASK_NORMAL; // not so concerned, but better keep it alive
 }
 
@@ -200,9 +197,7 @@ NET_HANDLE(ENT_CLIENT_VIEWLOC, bool isnew)
        this.origin = ReadVector();
        setorigin(this, this.origin);
 
-       this.movedir_x = ReadAngle();
-       this.movedir_y = ReadAngle();
-       this.movedir_z = ReadAngle();
+       this.movedir = ReadAngleVector();
 
        return = true;