Merge branch 'master' into terencehill/weapon_panel_fix

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

diff --git a/qcsrc/server/func_breakable.qc b/qcsrc/server/func_breakable.qc
index a4ece016febdb62aa106c4f8f23bbd40ef137823..c0e54d11671093d0201ed5d51cd389d4d4859406 100644 (file)
--- a/qcsrc/server/func_breakable.qc
+++ b/qcsrc/server/func_breakable.qc
@@ -1,18 +1,4 @@
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../common/constants.qh"
-    #include "../common/util.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "../csqcmodellib/sv_model.qh"
-#endif
+#include "weapons/common.qh"
 
 .entity sprite;
 
@@ -47,7 +33,7 @@
 //   Otherwise mdl_dead will be displayed at the map origin, and nobody would
 //   want that!
 
-void func_breakable_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force);
+void func_breakable_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force);
 
 //
 // func_breakable
@@ -93,7 +79,7 @@ void func_breakable_colormod()
                self.colormod = '1 0 0' + '0 1 0' * (2 * h - 0.5);
        else
                self.colormod = '1 1 1';
-               
+
        CSQCMODEL_AUTOUPDATE();
 }
 
@@ -156,7 +142,7 @@ void func_breakable_destroyed()
 {
        func_breakable_look_destroyed();
        func_breakable_behave_destroyed();
-       
+
        CSQCMODEL_AUTOUPDATE();
 }
 
@@ -164,7 +150,7 @@ void func_breakable_restore()
 {
        func_breakable_look_restore();
        func_breakable_behave_restore();
-       
+
        CSQCMODEL_AUTOUPDATE();
 }
 
@@ -204,7 +190,7 @@ void func_breakable_destroy() {
        self.message = oldmsg;
 }
 
-void func_breakable_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+void func_breakable_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
 {
        if(self.state == 1)
                return;
@@ -237,7 +223,7 @@ void func_breakable_reset()
                func_breakable_behave_destroyed();
        else
                func_breakable_behave_restore();
-               
+
        CSQCMODEL_AUTOUPDATE();
 }
 
@@ -290,7 +276,7 @@ void spawnfunc_func_breakable() {
 
        self.reset = func_breakable_reset;
        func_breakable_reset();
-       
+
        CSQCMODEL_AUTOINIT();
 }