Remove the g_ prefix from some server code files and rename sv_main to main

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / breakablehook / sv_breakablehook.qc

diff --git a/qcsrc/common/mutators/mutator/breakablehook/sv_breakablehook.qc b/qcsrc/common/mutators/mutator/breakablehook/sv_breakablehook.qc
index dfde6ed73b163be7c5bc3c30027d87b47f206793..c80b97d36b1d711dd575c94bf9123f2d1bd1a234 100644 (file)
--- a/qcsrc/common/mutators/mutator/breakablehook/sv_breakablehook.qc
+++ b/qcsrc/common/mutators/mutator/breakablehook/sv_breakablehook.qc
@@ -1,14 +1,14 @@
 #include "sv_breakablehook.qh"
 
 #include <common/deathtypes/all.qh>
-#include <server/g_hook.qh>
+#include <server/hook.qh>
 
 REGISTER_MUTATOR(breakablehook, cvar("g_breakablehook"));
 
 bool autocvar_g_breakablehook; // allow toggling mid match?
 bool autocvar_g_breakablehook_owner;
 
-MUTATOR_HOOKFUNCTION(breakablehook, PlayerDamage_Calculate)
+MUTATOR_HOOKFUNCTION(breakablehook, Damage_Calculate)
 {
        entity frag_attacker = M_ARGV(1, entity);
        entity frag_target = M_ARGV(2, entity);
@@ -22,7 +22,7 @@ MUTATOR_HOOKFUNCTION(breakablehook, PlayerDamage_Calculate)
                // hurt the owner of the hook
                if(DIFF_TEAM(frag_attacker, frag_target.realowner))
                {
-                       Damage (frag_target.realowner, frag_attacker, frag_attacker, 5, WEP_HOOK.m_id | HITTYPE_SPLASH, frag_target.realowner.origin, '0 0 0');
+                       Damage (frag_target.realowner, frag_attacker, frag_attacker, 5, WEP_HOOK.m_id | HITTYPE_SPLASH, DMG_NOWEP, frag_target.realowner.origin, '0 0 0'); // TODO: should get weapon entity from mutator hook
                        RemoveHook(frag_target);
                        return; // dead
                }