Fix CTF flags secretly spamming squashed messages, and fix a potential crash in clien...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / func / plat.qc

diff --git a/qcsrc/common/triggers/func/plat.qc b/qcsrc/common/triggers/func/plat.qc
index 6f7ebaad31522130f7b69bf3509346c2e1e5098c..36b4eeffffa1dd1af0d57f66b7207e2fde7c9802 100644 (file)
--- a/qcsrc/common/triggers/func/plat.qc
+++ b/qcsrc/common/triggers/func/plat.qc
@@ -1,3 +1,4 @@
+#include "plat.qh"
 REGISTER_NET_LINKED(ENT_CLIENT_PLAT)
 
 #ifdef SVQC
@@ -72,30 +73,23 @@ spawnfunc(func_plat)
 
        if (this.sounds == 1)
        {
-               precache_sound ("plats/plat1.wav");
-               precache_sound ("plats/plat2.wav");
                this.noise = "plats/plat1.wav";
                this.noise1 = "plats/plat2.wav";
        }
 
        if (this.sounds == 2)
        {
-               precache_sound ("plats/medplat1.wav");
-               precache_sound ("plats/medplat2.wav");
                this.noise = "plats/medplat1.wav";
                this.noise1 = "plats/medplat2.wav";
        }
 
        if (this.sound1)
-       {
-               precache_sound (this.sound1);
                this.noise = this.sound1;
-       }
        if (this.sound2)
-       {
-               precache_sound (this.sound2);
                this.noise1 = this.sound2;
-       }
+
+       if(this.noise && this.noise != "") { precache_sound(this.noise); }
+       if(this.noise1 && this.noise1 != "") { precache_sound(this.noise1); }
 
        this.mangle = this.angles;
        this.angles = '0 0 0';
@@ -168,17 +162,16 @@ NET_HANDLE(ENT_CLIENT_PLAT, bool isnew)
 
                this.classname = "plat";
                this.solid = SOLID_BSP;
-               this.movetype = MOVETYPE_PUSH;
+               set_movetype(this, MOVETYPE_PUSH);
                this.drawmask = MASK_NORMAL;
                this.draw = plat_draw;
+               if (isnew) IL_PUSH(g_drawables, this);
                this.use = plat_use;
                this.entremove = trigger_remove_generic;
 
                plat_reset(this); // also called here
 
-               this.move_movetype = MOVETYPE_PUSH;
-               this.move_origin = this.origin;
-               this.move_angles = this.angles;
+               set_movetype(this, MOVETYPE_PUSH);
                this.move_time = time;
 
                plat_spawn_inside_trigger(this);
@@ -188,8 +181,6 @@ NET_HANDLE(ENT_CLIENT_PLAT, bool isnew)
        {
                plat_reset(this);
 
-               this.move_origin = this.origin;
-               this.move_angles = this.angles;
                this.move_time = time;
        }
        return true;