Merge branch 'master' into TimePath/debug_draw

[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 101f16796a27c3f565404ce3f509708f7e3945f0..eecb046b63f9974ae3c6ec7177835fc2981a1848 100644 (file)
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -1,19 +1,22 @@
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../common/constants.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../csqcmodellib/sv_model.qh"
-#endif
+
+#include "g_subs.qh"
+#include "../common/triggers/subs.qh"
+#include "../common/triggers/triggers.qh"
+
+entityclass(BGMScript);
+class(BGMScript) .string bgmscript;
+class(BGMScript) .float bgmscriptattack;
+class(BGMScript) .float bgmscriptdecay;
+class(BGMScript) .float bgmscriptsustain;
+class(BGMScript) .float bgmscriptrelease;
+
+#include "../common/constants.qh"
+#include "../lib/csqcmodel/sv_model.qh"
 
 .float modelscale;
 
 void g_model_setcolormaptoactivator (void)
-{
+{SELFPARAM();
        if(teamplay)
        {
                if(activator.team)
@@ -23,17 +26,17 @@ void g_model_setcolormaptoactivator (void)
        }
        else
                self.colormap = floor(random() * 256);
-       self.colormap |= 1024; // RENDER_COLORMAPPED
+       self.colormap |= BIT(10); // RENDER_COLORMAPPED
 }
 
 void g_clientmodel_setcolormaptoactivator (void)
-{
+{SELFPARAM();
        g_model_setcolormaptoactivator();
-       self.SendFlags |= 9;
+       self.SendFlags |= (BIT(3) | BIT(0));
 }
 
 void g_clientmodel_use(void)
-{
+{SELFPARAM();
        if (self.antiwall_flag == 1)
        {
                self.inactive = 1;
@@ -48,7 +51,7 @@ void g_clientmodel_use(void)
 }
 
 void g_model_dropbyspawnflags()
-{
+{SELFPARAM();
        if((self.spawnflags & 3) == 1) // ALIGN_ORIGIN
        {
                traceline(self.origin, self.origin - '0 0 4096', MOVE_NOMONSTERS, self);
@@ -67,7 +70,7 @@ void g_model_dropbyspawnflags()
 }
 
 void g_clientmodel_dropbyspawnflags()
-{
+{SELFPARAM();
        vector o0;
        o0 = self.origin;
        g_model_dropbyspawnflags();
@@ -75,7 +78,7 @@ void g_clientmodel_dropbyspawnflags()
                self.SendFlags |= 2;
 }
 
-float g_clientmodel_genericsendentity (entity to, float sf)
+bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
 {
        sf = sf & 0x0F;
        if(self.angles != '0 0 0')
@@ -90,20 +93,20 @@ float g_clientmodel_genericsendentity (entity to, float sf)
        WriteByte(MSG_ENTITY, ENT_CLIENT_WALL);
        WriteByte(MSG_ENTITY, sf);
 
-       if(sf & 1)
+       if(sf & BIT(0))
        {
                if(sf & 0x40)
                        WriteShort(MSG_ENTITY, self.colormap);
        }
 
-       if(sf & 2)
+       if(sf & BIT(1))
        {
                WriteCoord(MSG_ENTITY, self.origin.x);
                WriteCoord(MSG_ENTITY, self.origin.y);
                WriteCoord(MSG_ENTITY, self.origin.z);
        }
 
-       if(sf & 4)
+       if(sf & BIT(2))
        {
                if(sf & 0x10)
                {
@@ -113,7 +116,7 @@ float g_clientmodel_genericsendentity (entity to, float sf)
                }
        }
 
-       if(sf & 8)
+       if(sf & BIT(3))
        {
                if(sf & 0x80)
                {
@@ -153,6 +156,7 @@ float g_clientmodel_genericsendentity (entity to, float sf)
                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;
@@ -179,15 +183,15 @@ float g_clientmodel_genericsendentity (entity to, float sf)
        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
+spawnfunc(misc_gamemodel)         { self.angles_x = -self.angles.x; G_MODEL_INIT      (SOLID_NOT) } // model entity
+spawnfunc(misc_clientmodel)       { self.angles_x = -self.angles.x; G_CLIENTMODEL_INIT(SOLID_NOT) } // model entity
+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)
-void spawnfunc_func_clientillusionary() { G_CLIENTMODEL_INIT(SOLID_NOT) } // brush entity
-void spawnfunc_func_static()            { G_MODEL_INIT      (SOLID_NOT) } // DEPRECATED old alias name from some other game
+spawnfunc(func_illusionary)       { G_MODEL_INIT      (SOLID_NOT) } // Q1 name (WARNING: MISPREDICTED)
+spawnfunc(func_clientillusionary) { G_CLIENTMODEL_INIT(SOLID_NOT) } // brush entity
+spawnfunc(func_static)            { G_MODEL_INIT      (SOLID_NOT) } // DEPRECATED old alias name from some other game
 
 // solid brush entities
-void spawnfunc_func_wall()              { G_MODEL_INIT      (SOLID_BSP) } // Q1 name
-void spawnfunc_func_clientwall()        { G_CLIENTMODEL_INIT(SOLID_BSP) } // brush entity (WARNING: MISPREDICTED)
+spawnfunc(func_wall)              { G_MODEL_INIT      (SOLID_BSP) } // Q1 name
+spawnfunc(func_clientwall)        { G_CLIENTMODEL_INIT(SOLID_BSP) } // brush entity (WARNING: MISPREDICTED)