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 fa7044fc29e4a7db03026565310335b71e5bee81..d870d81e98a32d487600821a91bc5bdac553c1ec 100644 (file)
--- a/qcsrc/client/modeleffects.qc
+++ b/qcsrc/client/modeleffects.qc
@@ -1,12 +1,11 @@
 #include "modeleffects.qh"
-#include "_all.qh"
 
 .float cnt;
 .float scale;
 .float alpha;
 
-void ModelEffect_Draw()
-{SELFPARAM();
+void ModelEffect_Draw(entity this)
+{
        self.angles = self.angles + frametime * self.avelocity;
        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);