Merge branch 'terencehill/menu_remove_tab_title' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / modeleffects.qc

diff --git a/qcsrc/client/modeleffects.qc b/qcsrc/client/modeleffects.qc
index 7652577321d18ad37c3fdb07da2c2b8a1d06f02e..c44fbe4dca452dfe702d72e96135a04212284a78 100644 (file)
--- a/qcsrc/client/modeleffects.qc
+++ b/qcsrc/client/modeleffects.qc
@@ -1,12 +1,14 @@
-.float frame1time;
-.float lifetime, fadetime;
-.float teleport_time;
-.float scale1, scale2;
+#include "modeleffects.qh"
+#include "_all.qh"
+
+.float cnt;
+.float scale;
+.float alpha;
 
 void ModelEffect_Draw()
 {
        self.angles = self.angles + frametime * self.avelocity;
-       self.origin = self.origin + frametime * self.velocity;
+       setorigin(self, self.origin + frametime * self.velocity);
        self.scale = self.scale1 + (self.scale2 - self.scale1) * (time - self.teleport_time) / (self.lifetime + self.fadetime - self.teleport_time);
        self.alpha = self.cnt * bound(0, 1 - (time - self.lifetime) / self.fadetime, 1);
        if(self.alpha < ALPHA_MIN_VISIBLE)
@@ -14,21 +16,21 @@ void ModelEffect_Draw()
                remove(self);
                return;
        }
+       self.drawmask = MASK_NORMAL;
        if(self.scale <= 0)
+       {
+               self.drawmask = 0;
                return;
-       R_AddEntity(self);
+       }
 }
 
-void Ent_ModelEffect(float isNew)
+void Ent_ModelEffect(bool isNew)
 {
-       float f;
-       entity e;
-
        self.classname = "modeleffect_spawner";
 
-       f = ReadByte();
+       int f = ReadByte();
 
-       e = spawn();
+       entity e = spawn();
        e.classname = "modeleffect";
        e.model = "from network";
        e.modelindex = ReadShort();
@@ -38,6 +40,7 @@ void Ent_ModelEffect(float isNew)
        e.origin_x = ReadCoord();
        e.origin_y = ReadCoord();
        e.origin_z = ReadCoord();
+       setorigin(e, e.origin);
        if(f & 1)
        {
                e.velocity_x = ReadCoord();