Merge branch 'Mario/rifle_arena' into Mario/mutators

[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..74b7db2f0db66fad25135150525f6d762f1dfd61 100644 (file)
--- a/qcsrc/server/mutators/mutator_physical_items.qc
+++ b/qcsrc/server/mutators/mutator_physical_items.qc
@@ -14,7 +14,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
                        {
@@ -57,7 +57,7 @@ void physical_item_damage(entity inflictor, entity attacker, float damage, float
 
 MUTATOR_HOOKFUNCTION(item_spawning)
 {
-       if(self.owner == world && autocvar_g_ode_items <= 1)
+       if(self.owner == world && autocvar_g_physical_items <= 1)
                return FALSE;
        if (self.spawnflags & 1) // floating item
                return FALSE;
@@ -79,7 +79,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);
 
@@ -100,10 +100,28 @@ MUTATOR_HOOKFUNCTION(item_spawning)
 
 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 not(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE"))
+               {
+                       dprint("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
+       {
+               print("This cannot be removed at runtime\n");
+               return -1;
+       }
+
+       return 0;
 }