Merge branch 'master' into terencehill/min_spec_time

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / physical_items / sv_physical_items.qc

diff --git a/qcsrc/common/mutators/mutator/physical_items/sv_physical_items.qc b/qcsrc/common/mutators/mutator/physical_items/sv_physical_items.qc
index 62781c92073cfbd11278ea0313364bdac5bc0d8e..63b43e018378c32be72c64437eff5fd475a7f307 100644 (file)
--- a/qcsrc/common/mutators/mutator/physical_items/sv_physical_items.qc
+++ b/qcsrc/common/mutators/mutator/physical_items/sv_physical_items.qc
@@ -4,7 +4,7 @@ int autocvar_g_physical_items;
 float autocvar_g_physical_items_damageforcescale;
 float autocvar_g_physical_items_reset;
 
-REGISTER_MUTATOR(physical_items, cvar("g_physical_items"))
+REGISTER_MUTATOR(physical_items, autocvar_g_physical_items)
 {
        // check if we have a physics engine
        MUTATOR_ONADD
@@ -79,7 +79,7 @@ void physical_item_touch(entity this, entity toucher)
        }
 }
 
-void physical_item_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
+void physical_item_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force)
 {
        if(!this.cnt) // not for dropped items
        if(ITEM_DAMAGE_NEEDKILL(deathtype))