Merge branch 'master' into Mario/qc_physics_prehax

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_models.qc

diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc
index e25ce66f3229a80c41ef44d19e702bc5579934d7..62b2cfb51dd5d3a5c9a52a38b78d9654c0e97e58 100644 (file)
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -1,7 +1,8 @@
 #include "_all.qh"
 
-#include "g_subs.qh"
-#include "g_triggers.qh"
+#include "../common/triggers/subs.qh"
+
+#include "../client/bgmscript.qh"
 
 #include "../common/constants.qh"
 #include "../csqcmodellib/sv_model.qh"
@@ -25,7 +26,22 @@ void g_model_setcolormaptoactivator (void)
 void g_clientmodel_setcolormaptoactivator (void)
 {
        g_model_setcolormaptoactivator();
-       self.SendFlags |= 1;
+       self.SendFlags |= (8 | 1);
+}
+
+void g_clientmodel_use(void)
+{
+       if (self.antiwall_flag == 1)
+       {
+               self.inactive = 1;
+               self.solid = SOLID_NOT;
+       }
+       else if (self.antiwall_flag == 2)
+       {
+               self.inactive = 0;
+               self.solid = self.default_solid;
+       }
+       g_clientmodel_setcolormaptoactivator();
 }
 
 void g_model_dropbyspawnflags()
@@ -61,7 +77,7 @@ float g_clientmodel_genericsendentity (entity to, int sf)
        sf = sf & 0x0F;
        if(self.angles != '0 0 0')
                sf |= 0x10;
-       if(self.solid && (self.mins != '0 0 0' || self.maxs != '0 0 0'))
+       if(self.mins != '0 0 0' || self.maxs != '0 0 0')
                sf |= 0x20;
        if(self.colormap != 0)
                sf |= 0x40;
@@ -129,6 +145,12 @@ float g_clientmodel_genericsendentity (entity to, int sf)
                        WriteCoord(MSG_ENTITY, self.movedir.z);
                        WriteByte(MSG_ENTITY, floor(self.lip * 255));
                }
+               WriteShort(MSG_ENTITY, self.fade_start);
+               WriteShort(MSG_ENTITY, self.fade_end);
+               WriteShort(MSG_ENTITY, self.alpha_max);
+               WriteShort(MSG_ENTITY, self.alpha_min);
+               WriteShort(MSG_ENTITY, self.inactive);
+               WriteShort(MSG_ENTITY, self.fade_vertical_offset);
        }
 
        return true;
@@ -147,11 +169,12 @@ float g_clientmodel_genericsendentity (entity to, int sf)
        if(self.geomtype) if(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")) self.movetype = MOVETYPE_PHYSICS; \
        if(!self.scale) self.scale = self.modelscale; \
        SetBrushEntityModel(); \
-       self.use = g_clientmodel_setcolormaptoactivator; \
+       self.use = g_clientmodel_use; \
        InitializeEntity(self, g_clientmodel_dropbyspawnflags, INITPRIO_DROPTOFLOOR); \
        if(!self.solid) self.solid = (sol); else if(self.solid < 0) self.solid = SOLID_NOT; \
        if(!self.bgmscriptsustain) self.bgmscriptsustain = 1; else if(self.bgmscriptsustain < 0) self.bgmscriptsustain = 0; \
-       Net_LinkEntity(self, true, 0, g_clientmodel_genericsendentity);
+       Net_LinkEntity(self, true, 0, g_clientmodel_genericsendentity); \
+       self.default_solid = sol;
 
 // non-solid model entities:
 void spawnfunc_misc_gamemodel()         { self.angles_x = -self.angles.x; G_MODEL_INIT      (SOLID_NOT) } // model entity