Allow turning off damage from lava and slime in instagib, as it used to be

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

diff --git a/qcsrc/server/mutators/mutator_physical_items.qc b/qcsrc/server/mutators/mutator_physical_items.qc
index 9dcab5b2e276cc726aad648ac48eb8d79e6544c3..08bb81a9f6a9d6a646a1103a6771b7b23eae7952 100644 (file)
--- a/qcsrc/server/mutators/mutator_physical_items.qc
+++ b/qcsrc/server/mutators/mutator_physical_items.qc
@@ -1,3 +1,7 @@
+#include "../_all.qh"
+
+#include "mutator.qh"
+
 .vector spawn_origin, spawn_angles;
 
 void physical_item_think()
@@ -14,7 +18,7 @@ void physical_item_think()
                self.glowmod = self.owner.glowmod;
 
                // if the item is not spawned, make sure the invisible / ghost item returns to its origin and stays there
-               if(autocvar_g_ode_items_reset)
+               if(autocvar_g_physical_items_reset)
                {
                        if(self.owner.nextthink > time) // awaiting respawn
                        {
@@ -45,7 +49,7 @@ void physical_item_touch()
        }
 }
 
-void physical_item_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+void physical_item_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
 {
        if(!self.cnt) // not for dropped items
        if(ITEM_DAMAGE_NEEDKILL(deathtype))
@@ -57,10 +61,10 @@ void physical_item_damage(entity inflictor, entity attacker, float damage, float
 
 MUTATOR_HOOKFUNCTION(item_spawning)
 {
-       if(self.owner == world && autocvar_g_ode_items <= 1)
-               return FALSE;
+       if(self.owner == world && autocvar_g_physical_items <= 1)
+               return false;
        if (self.spawnflags & 1) // floating item
-               return FALSE;
+               return false;
 
        // The actual item can't be physical and trigger at the same time, so make it invisible and use a second entity for physics.
        // Ugly hack, but unless SOLID_TRIGGER is gotten to work with MOVETYPE_PHYSICS in the engine it can't be fixed.
@@ -79,7 +83,7 @@ MUTATOR_HOOKFUNCTION(item_spawning)
        wep.effects |= EF_NOMODELFLAGS; // disable the spinning
        wep.colormap = self.owner.colormap;
        wep.glowmod = self.owner.glowmod;
-       wep.damageforcescale = autocvar_g_ode_items_damageforcescale;
+       wep.damageforcescale = autocvar_g_physical_items_damageforcescale;
        wep.dphitcontentsmask = self.dphitcontentsmask;
        wep.cnt = (self.owner != world);
 
@@ -95,15 +99,33 @@ MUTATOR_HOOKFUNCTION(item_spawning)
        self.movetype = MOVETYPE_FOLLOW;
        self.aiment = wep; // attach the original weapon
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_DEFINITION(mutator_physical_items)
 {
-       if not(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE"))
-               return FALSE;
-
        MUTATOR_HOOK(Item_Spawn, item_spawning, CBC_ORDER_ANY);
 
-       return FALSE;
+       // check if we have a physics engine
+       MUTATOR_ONADD
+       {
+               if (!(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")))
+               {
+                       LOG_TRACE("Warning: Physical items are enabled but no physics engine can be used. Reverting to old items.\n");
+                       return -1;
+               }
+       }
+
+       MUTATOR_ONROLLBACK_OR_REMOVE
+       {
+               // nothing to roll back
+       }
+
+       MUTATOR_ONREMOVE
+       {
+               LOG_INFO("This cannot be removed at runtime\n");
+               return -1;
+       }
+
+       return 0;
 }