Rename defs to qh

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

diff --git a/qcsrc/client/wall.qc b/qcsrc/client/wall.qc
index 2e8d6c0e9596419685ad0e9c4f061fee390ad939..2f086eac2d2971eeff77e14e3c2e7cc73ca16503 100644 (file)
--- a/qcsrc/client/wall.qc
+++ b/qcsrc/client/wall.qc
@@ -1,47 +1,61 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qh"
+       #include "../common/util.qh"
+       #include "autocvars.qh"
+       #include "../csqcmodellib/interpolate.qh"
+       #include "bgmscript.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 .float lip;
 .float bgmscriptangular;
-.float lodmodelindex1, lodmodelindex2;
+.int lodmodelindex0, lodmodelindex1, lodmodelindex2;
 .float loddistance1, loddistance2;
+.vector saved;
 
 void Ent_Wall_Draw()
 {
        float f;
-       float d;
-       vector save;
        var .vector fld;
 
+       if(self.bgmscriptangular)
+               fld = angles;
+       else
+               fld = origin;
+       self.fld = self.saved;
+
        if(self.lodmodelindex1)
        {
-               d = cvar("loddebug");
-               if(d > 0)
+               if(autocvar_cl_modeldetailreduction <= 0)
                {
-                       if(d == 1)
-                               self.modelindex = self.lodmodelindex0;
-                       else if(d == 2 || !self.lodmodelindex2)
-                               self.modelindex = self.lodmodelindex1;
-                       else // if(d == 3)
+                       if(self.lodmodelindex2 && autocvar_cl_modeldetailreduction <= -2)
                                self.modelindex = self.lodmodelindex2;
+                       else if(autocvar_cl_modeldetailreduction <= -1)
+                               self.modelindex = self.lodmodelindex1;
+                       else
+                               self.modelindex = self.lodmodelindex0;
                }
                else
                {
-                       d = vlen(NearestPointOnBox(self, view_origin) - view_origin);
-                       if(d < self.loddistance1)
-                               self.modelindex = self.lodmodelindex0;
-                       else if(!self.lodmodelindex2 || d < self.loddistance2)
+                       float distance = vlen(NearestPointOnBox(self, view_origin) - view_origin);
+                       f = (distance * current_viewzoom + 100.0) * autocvar_cl_modeldetailreduction;
+                       f *= 1.0 / bound(0.01, view_quality, 1);
+                       if(self.lodmodelindex2 && f > self.loddistance2)
+                               self.modelindex = self.lodmodelindex2;
+                       else if(f > self.loddistance1)
                                self.modelindex = self.lodmodelindex1;
                        else
-                               self.modelindex = self.lodmodelindex2;
+                               self.modelindex = self.lodmodelindex0;
                }
        }
 
        InterpolateOrigin_Do();
 
-       if(self.bgmscriptangular)
-               fld = angles;
-       else
-               fld = origin;
-       
-       save = self.fld;
+       self.saved = self.fld;
+
        f = BGMScript(self);
        if(f >= 0)
        {
@@ -55,9 +69,9 @@ void Ent_Wall_Draw()
                self.alpha = 1;
 
        if(self.alpha >= ALPHA_MIN_VISIBLE)
-               R_AddEntity(self);
-
-       self.fld = save;
+               self.drawmask = MASK_NORMAL;
+       else
+               self.drawmask = 0;
 }
 
 void Ent_Wall_Remove()
@@ -69,9 +83,17 @@ void Ent_Wall_Remove()
 
 void Ent_Wall()
 {
-       float f;
+       int f;
+       var .vector fld;
+
        InterpolateOrigin_Undo();
-       self.iflags = IFLAG_ANGLES;
+       self.iflags = IFLAG_ANGLES | IFLAG_ORIGIN;
+
+       if(self.bgmscriptangular)
+               fld = angles;
+       else
+               fld = origin;
+       self.fld = self.saved;
 
        f = ReadByte();
 
@@ -88,6 +110,7 @@ void Ent_Wall()
                self.origin_x = ReadCoord();
                self.origin_y = ReadCoord();
                self.origin_z = ReadCoord();
+               setorigin(self, self.origin);
        }
 
        if(f & 4)
@@ -131,6 +154,7 @@ void Ent_Wall()
                }
                else
                        self.mins = self.maxs = '0 0 0';
+               setsize(self, self.mins, self.maxs);
 
                if(self.bgmscript)
                        strunzone(self.bgmscript);
@@ -161,6 +185,8 @@ void Ent_Wall()
 
        InterpolateOrigin_Note();
 
+       self.saved = self.fld;
+
        self.entremove = Ent_Wall_Remove;
        self.draw = Ent_Wall_Draw;
 }