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 8a2fe9ef3334faf5d067d2ca101ee235428f62df..62b2cfb51dd5d3a5c9a52a38b78d9654c0e97e58 100644 (file)
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -1,3 +1,12 @@
+#include "_all.qh"
+
+#include "../common/triggers/subs.qh"
+
+#include "../client/bgmscript.qh"
+
+#include "../common/constants.qh"
+#include "../csqcmodellib/sv_model.qh"
+
 .float modelscale;
 
 void g_model_setcolormaptoactivator (void)
@@ -17,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()
@@ -35,7 +59,7 @@ void g_model_dropbyspawnflags()
        else if((self.spawnflags & 3) == 3) // ALIGN_ORIGIN | ALIGN_BOTTOM
        {
                traceline(self.origin, self.origin - '0 0 4096', MOVE_NOMONSTERS, self);
-               setorigin(self, trace_endpos - '0 0 1' * self.mins_z);
+               setorigin(self, trace_endpos - '0 0 1' * self.mins.z);
        }
 }
 
@@ -48,12 +72,12 @@ void g_clientmodel_dropbyspawnflags()
                self.SendFlags |= 2;
 }
 
-float g_clientmodel_genericsendentity (entity to, float sf)
+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;
@@ -71,18 +95,18 @@ float g_clientmodel_genericsendentity (entity to, float sf)
 
        if(sf & 2)
        {
-               WriteCoord(MSG_ENTITY, self.origin_x);
-               WriteCoord(MSG_ENTITY, self.origin_y);
-               WriteCoord(MSG_ENTITY, self.origin_z);
+               WriteCoord(MSG_ENTITY, self.origin.x);
+               WriteCoord(MSG_ENTITY, self.origin.y);
+               WriteCoord(MSG_ENTITY, self.origin.z);
        }
 
        if(sf & 4)
        {
                if(sf & 0x10)
                {
-                       WriteAngle(MSG_ENTITY, self.angles_x);
-                       WriteAngle(MSG_ENTITY, self.angles_y);
-                       WriteAngle(MSG_ENTITY, self.angles_z);
+                       WriteAngle(MSG_ENTITY, self.angles.x);
+                       WriteAngle(MSG_ENTITY, self.angles.y);
+                       WriteAngle(MSG_ENTITY, self.angles.z);
                }
        }
 
@@ -102,12 +126,12 @@ float g_clientmodel_genericsendentity (entity to, float sf)
                WriteShort(MSG_ENTITY, floor(self.scale * 256));
                if(sf & 0x20)
                {
-                       WriteCoord(MSG_ENTITY, self.mins_x);
-                       WriteCoord(MSG_ENTITY, self.mins_y);
-                       WriteCoord(MSG_ENTITY, self.mins_z);
-                       WriteCoord(MSG_ENTITY, self.maxs_x);
-                       WriteCoord(MSG_ENTITY, self.maxs_y);
-                       WriteCoord(MSG_ENTITY, self.maxs_z);
+                       WriteCoord(MSG_ENTITY, self.mins.x);
+                       WriteCoord(MSG_ENTITY, self.mins.y);
+                       WriteCoord(MSG_ENTITY, self.mins.z);
+                       WriteCoord(MSG_ENTITY, self.maxs.x);
+                       WriteCoord(MSG_ENTITY, self.maxs.y);
+                       WriteCoord(MSG_ENTITY, self.maxs.z);
                }
                WriteString(MSG_ENTITY, self.bgmscript);
                if(self.bgmscript != "")
@@ -116,14 +140,20 @@ float g_clientmodel_genericsendentity (entity to, float sf)
                        WriteByte(MSG_ENTITY, floor(self.bgmscriptdecay * 64));
                        WriteByte(MSG_ENTITY, floor(self.bgmscriptsustain * 255));
                        WriteByte(MSG_ENTITY, floor(self.bgmscriptrelease * 64));
-                       WriteCoord(MSG_ENTITY, self.movedir_x);
-                       WriteCoord(MSG_ENTITY, self.movedir_y);
-                       WriteCoord(MSG_ENTITY, self.movedir_z);
+                       WriteCoord(MSG_ENTITY, self.movedir.x);
+                       WriteCoord(MSG_ENTITY, self.movedir.y);
+                       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;
+       return true;
 }
 
 
@@ -139,16 +169,17 @@ float g_clientmodel_genericsendentity (entity to, float 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
-void spawnfunc_misc_clientmodel()       { self.angles_x = -self.angles_x; G_CLIENTMODEL_INIT(SOLID_NOT) } // model entity
-void spawnfunc_misc_models()            { self.angles_x = -self.angles_x; G_MODEL_INIT      (SOLID_NOT) } // DEPRECATED old compat entity with confusing name, do not use
+void spawnfunc_misc_gamemodel()         { self.angles_x = -self.angles.x; G_MODEL_INIT      (SOLID_NOT) } // model entity
+void spawnfunc_misc_clientmodel()       { self.angles_x = -self.angles.x; G_CLIENTMODEL_INIT(SOLID_NOT) } // model entity
+void spawnfunc_misc_models()            { self.angles_x = -self.angles.x; G_MODEL_INIT      (SOLID_NOT) } // DEPRECATED old compat entity with confusing name, do not use
 
 // non-solid brush entities:
 void spawnfunc_func_illusionary()       { G_MODEL_INIT      (SOLID_NOT) } // Q1 name (WARNING: MISPREDICTED)