X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_vampire.qc;h=d06b0eed5ea2fe6318c60dfbc88d4f0159631c4e;hb=74c8797d64197059556339cd98e3a78731a5049f;hp=edfcba4398d2da3eff0d465ecb03ef341fe37f75;hpb=265b681e0fb49239df1bfc431a903f66244a3172;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator_vampire.qc b/qcsrc/server/mutators/mutator_vampire.qc
index edfcba439..d06b0eed5 100644
--- a/qcsrc/server/mutators/mutator_vampire.qc
+++ b/qcsrc/server/mutators/mutator_vampire.qc
@@ -1,4 +1,8 @@
-MUTATOR_HOOKFUNCTION(vampire_PlayerDamage)
+#include "mutator.qh"
+
+REGISTER_MUTATOR(vampire, cvar("g_vampire") && !cvar("g_instagib"));
+
+MUTATOR_HOOKFUNCTION(vampire, PlayerDamage_SplitHealthArmor)
 {
 	if(time >= frag_target.spawnshieldtime)
 	if(frag_target != frag_attacker)
@@ -7,27 +11,18 @@ MUTATOR_HOOKFUNCTION(vampire_PlayerDamage)
 		frag_attacker.health += bound(0, damage_take, frag_target.health);
 		frag_attacker.health = bound(0, frag_attacker.health, autocvar_g_balance_health_limit);
 	}
-		
-	return FALSE;
+
+	return false;
 }
 
-MUTATOR_HOOKFUNCTION(vampire_BuildMutatorsString)
+MUTATOR_HOOKFUNCTION(vampire, BuildMutatorsString)
 {
 	ret_string = strcat(ret_string, ":Vampire");
 	return 0;
 }
 
-MUTATOR_HOOKFUNCTION(vampire_BuildMutatorsPrettyString)
+MUTATOR_HOOKFUNCTION(vampire, BuildMutatorsPrettyString)
 {
 	ret_string = strcat(ret_string, ", Vampire");
 	return 0;
 }
-
-MUTATOR_DEFINITION(mutator_vampire)
-{
-	MUTATOR_HOOK(PlayerDamage_SplitHealthArmor, vampire_PlayerDamage, CBC_ORDER_ANY);
-	MUTATOR_HOOK(BuildMutatorsString, vampire_BuildMutatorsString, CBC_ORDER_ANY);
-	MUTATOR_HOOK(BuildMutatorsPrettyString, vampire_BuildMutatorsPrettyString, CBC_ORDER_ANY);
-
-	return 0;
-}