Merge branch 'master' into develop

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / effects / qc / casings.qc

diff --git a/qcsrc/common/effects/qc/casings.qc b/qcsrc/common/effects/qc/casings.qc
index 0e04984d61666a0f4d3607fce011a170a4410f73..c0c7f5ac98d41bc95cb90948d4234f84c007f6dc 100644 (file)
--- a/qcsrc/common/effects/qc/casings.qc
+++ b/qcsrc/common/effects/qc/casings.qc
@@ -10,15 +10,8 @@
 
 REGISTER_NET_TEMP(casings)
 
-#if defined(SVQC)
-.bool cvar_cl_casings;
-.bool cvar_r_drawviewmodel;
-#elif defined(CSQC)
-bool cvar_cl_casings;
-bool cvar_r_drawviewmodel;
-#endif
 REPLICATE(cvar_cl_casings, bool, "cl_casings");
-REPLICATE(cvar_r_drawviewmodel, bool, "r_drawviewmodel");
+REPLICATE(cvar_r_drawviewmodel, int, "r_drawviewmodel");
 
 #ifdef SVQC
 void SpawnCasing(vector vel, float randomvel, vector ang, vector avel, float randomavel, int casingtype, entity casingowner, .entity weaponentity)
@@ -27,9 +20,9 @@ void SpawnCasing(vector vel, float randomvel, vector ang, vector avel, float ran
        org = casingowner.origin + casingowner.view_ofs + org.x * v_forward - org.y * v_right + org.z * v_up;
 
        FOREACH_CLIENT(true, {
-               if (!(CS(it).cvar_cl_casings))
+               if (!(CS_CVAR(it).cvar_cl_casings))
                        continue;
-               if (it == casingowner && !(CS(it).cvar_r_drawviewmodel))
+               if (it == casingowner && !(CS_CVAR(it).cvar_r_drawviewmodel))
                        continue;
 
                msg_entity = it;
@@ -149,7 +142,7 @@ NET_HANDLE(casings, bool isNew)
     ang_z = ReadByte() * 360 / 256;
     return = true;
 
-    Casing casing = RubbleNew(new(casing));
+    Casing casing = ListNewChildRubble(CasingsNGibs, new(casing));
     casing.silent = (_state & 0x80);
     casing.state = (_state & 0x7F);
     casing.origin = org;
@@ -183,7 +176,7 @@ NET_HANDLE(casings, bool isNew)
 
     setsize(casing, '0 0 -1', '0 0 -1');
 
-    RubbleLimit("casing", autocvar_cl_casings_maxcount, Casing_Delete);
+    LimitedChildrenRubble(CasingsNGibs, "casing", autocvar_cl_casings_maxcount, Casing_Delete, NULL);
 }
 
 #endif