Merge branch 'master' into terencehill/hud_cleanups

[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 d00b4de29bf2fba84c69a9fb0d39b768ce12fb9c..8bc5387367542162947a07b205be9b51b3db38a9 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)
@@ -27,34 +30,28 @@ void g_model_setcolormaptoactivator (void)
 }
 
 void g_clientmodel_setcolormaptoactivator (void)
-{
+{SELFPARAM();
        g_model_setcolormaptoactivator();
-       self.SendFlags |= 9;
+       self.SendFlags |= (8 | 1);
 }
 
 void g_clientmodel_use(void)
-{
+{SELFPARAM();
        if (self.antiwall_flag == 1)
        {
                self.inactive = 1;
+               self.solid = SOLID_NOT;
        }
        else if (self.antiwall_flag == 2)
        {
                self.inactive = 0;
-       }
-       if (self.inactive)
-       {
-               self.solid = SOLID_NOT;
-       }
-       else
-       {
                self.solid = self.default_solid;
        }
        g_clientmodel_setcolormaptoactivator();
 }
 
 void g_model_dropbyspawnflags()
-{
+{SELFPARAM();
        if((self.spawnflags & 3) == 1) // ALIGN_ORIGIN
        {
                traceline(self.origin, self.origin - '0 0 4096', MOVE_NOMONSTERS, self);
@@ -73,7 +70,7 @@ void g_model_dropbyspawnflags()
 }
 
 void g_clientmodel_dropbyspawnflags()
-{
+{SELFPARAM();
        vector o0;
        o0 = self.origin;
        g_model_dropbyspawnflags();
@@ -81,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')
@@ -159,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;
@@ -185,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)