Merge branch 'master' into terencehill/hud_cleanups

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

diff --git a/qcsrc/client/modeleffects.qc b/qcsrc/client/modeleffects.qc
index 0508a8669a984ab102530a5403c1e59a7aa20667..d870d81e98a32d487600821a91bc5bdac553c1ec 100644 (file)
--- a/qcsrc/client/modeleffects.qc
+++ b/qcsrc/client/modeleffects.qc
@@ -1,9 +1,10 @@
-.float frame1time;
-.float lifetime, fadetime;
-.float teleport_time;
-.float scale1, scale2;
+#include "modeleffects.qh"
 
-void ModelEffect_Draw()
+.float cnt;
+.float scale;
+.float alpha;
+
+void ModelEffect_Draw(entity this)
 {
        self.angles = self.angles + frametime * self.avelocity;
        setorigin(self, self.origin + frametime * self.velocity);
@@ -22,16 +23,13 @@ void ModelEffect_Draw()
        }
 }
 
-void Ent_ModelEffect(float isNew)
-{
-       float f;
-       entity e;
-
+void Ent_ModelEffect(bool isNew)
+{SELFPARAM();
        self.classname = "modeleffect_spawner";
 
-       f = ReadByte();
+       int f = ReadByte();
 
-       e = spawn();
+       entity e = spawn();
        e.classname = "modeleffect";
        e.model = "from network";
        e.modelindex = ReadShort();