Merge branch 'master' into terencehill/tooltips_cleanup

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

diff --git a/qcsrc/client/wall.qh b/qcsrc/client/wall.qh
index 57aef7e0c51959d9c11eae7b858ded57b3ad2bb9..e05bb615edcf8713700d674e46f34be6326578ac 100644 (file)
--- a/qcsrc/client/wall.qh
+++ b/qcsrc/client/wall.qh
@@ -1,5 +1,5 @@
-#ifndef WALL_H
-#define WALL_H
+#ifndef CLIENT_WALL_H
+#define CLIENT_WALL_H
 
 entityclass(Wall);
 class(Wall) .float lip;
@@ -8,7 +8,15 @@ class(Wall) .int lodmodelindex0, lodmodelindex1, lodmodelindex2;
 class(Wall) .float loddistance1, loddistance2;
 class(Wall) .vector saved;
 
-void Ent_Wall_Draw();
+// Needed for interactive clientwalls
+.float inactive; // Clientwall disappears when inactive
+.float alpha_max, alpha_min;
+// If fade_start > fade_end, fadeout will be inverted
+// fade_vertical_offset is a vertival offset for player position
+.float fade_start, fade_end, fade_vertical_offset;
+.float default_solid;
+
+void Ent_Wall_Draw(entity this);
 
 void Ent_Wall_Remove();