Don't return if player doesn't have the default powerups (HUD panel isn't drawn if...

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

diff --git a/qcsrc/client/wall.qc b/qcsrc/client/wall.qc
index 34174073b95e01bb69c9ed6df01050fd22bc1c1b..64916ad8c17d05251f940ed0ae9e02e340ffb8bf 100644 (file)
--- a/qcsrc/client/wall.qc
+++ b/qcsrc/client/wall.qc
@@ -9,44 +9,44 @@
 .float scale;
 .vector movedir;
 
-void Ent_Wall_PreDraw()
-{SELFPARAM();
-       if (self.inactive)
+void Ent_Wall_PreDraw(entity this)
+{
+       if (this.inactive)
        {
-               self.alpha = 0;
+               this.alpha = 0;
        }
        else
        {
                vector org = getpropertyvec(VF_ORIGIN);
-               if(!checkpvs(org, self))
-                       self.alpha = 0;
-               else if(self.fade_start || self.fade_end) {
+               if(!checkpvs(org, this))
+                       this.alpha = 0;
+               else if(this.fade_start || this.fade_end) {
                        vector offset = '0 0 0';
-                       offset_z = self.fade_vertical_offset;
-                       float player_dist = vlen(org - self.origin - 0.5 * (self.mins + self.maxs) + offset);
-                       if (self.fade_end == self.fade_start)
+                       offset_z = this.fade_vertical_offset;
+                       float player_dist = vlen(org - this.origin - 0.5 * (this.mins + this.maxs) + offset);
+                       if (this.fade_end == this.fade_start)
                        {
-                               if (player_dist >= self.fade_start)
-                                       self.alpha = 0;
+                               if (player_dist >= this.fade_start)
+                                       this.alpha = 0;
                                else
-                                       self.alpha = 1;
+                                       this.alpha = 1;
                        }
                        else
                        {
-                               self.alpha = (self.alpha_min + self.alpha_max * bound(0,
-                                                          (self.fade_end - player_dist)
-                                                          / (self.fade_end - self.fade_start), 1)) / 100.0;
+                               this.alpha = (this.alpha_min + this.alpha_max * bound(0,
+                                                          (this.fade_end - player_dist)
+                                                          / (this.fade_end - this.fade_start), 1)) / 100.0;
                        }
                }
                else
                {
-                       self.alpha = 1;
+                       this.alpha = 1;
                }
        }
-       if(self.alpha <= 0)
-               self.drawmask = 0;
+       if(this.alpha <= 0)
+               this.drawmask = 0;
        else
-               self.drawmask = MASK_NORMAL;
+               this.drawmask = MASK_NORMAL;
 }
 
 void Ent_Wall_Draw(entity this)
@@ -213,11 +213,11 @@ NET_HANDLE(ENT_CLIENT_WALL, bool isnew)
                        this.movedir_z = ReadCoord();
                        this.lip = ReadByte() / 255.0;
                }
-               this.fade_start = ReadShort();
-               this.fade_end = ReadShort();
-               this.alpha_max = ReadShort();
-               this.alpha_min = ReadShort();
-               this.inactive = ReadShort();
+               this.fade_start = ReadByte();
+               this.fade_end = ReadByte();
+               this.alpha_max = ReadByte();
+               this.alpha_min = ReadByte();
+               this.inactive = ReadByte();
                this.fade_vertical_offset = ReadShort();
                BGMScript_InitEntity(this);
        }
@@ -230,5 +230,6 @@ NET_HANDLE(ENT_CLIENT_WALL, bool isnew)
 
        this.entremove = Ent_Wall_Remove;
        this.draw = Ent_Wall_Draw;
-       this.predraw = Ent_Wall_PreDraw;
+       if (isnew) IL_PUSH(g_drawables, this);
+       setpredraw(this, Ent_Wall_PreDraw);
 }