From: Mario <mario.mario@y7mail.com>
Date: Mon, 7 Oct 2013 23:54:42 +0000 (-0700)
Subject: Move nades throw check into the nades mutator
X-Git-Tag: xonotic-v0.8.0~70^2~26
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6d2af068b59d5dbc605112aabb81fe503b101d65;p=xonotic%2Fxonotic-data.pk3dir.git

Move nades throw check into the nades mutator
---

diff --git a/qcsrc/server/mutators/mutator_minstagib.qc b/qcsrc/server/mutators/mutator_minstagib.qc
index 0d90ea362..12888fd4d 100644
--- a/qcsrc/server/mutators/mutator_minstagib.qc
+++ b/qcsrc/server/mutators/mutator_minstagib.qc
@@ -203,7 +203,6 @@ MUTATOR_HOOKFUNCTION(minstagib_SplitHealthArmor)
 MUTATOR_HOOKFUNCTION(minstagib_ForbidThrowing)
 {
 	// weapon dropping on death handled by FilterItem
-	nades_CheckThrow();
 
 	return TRUE;
 }
diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index d911720de..42b2b167b 100644
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -286,6 +286,12 @@ void nades_CheckThrow()
 	}
 }
 
+MUTATOR_HOOKFUNCTION(nades_CheckThrow)
+{
+	if(MUTATOR_RETURNVALUE) { nades_CheckThrow(); }
+	return FALSE;
+}
+
 MUTATOR_HOOKFUNCTION(nades_VehicleEnter)
 {
 	if(other.nade)
@@ -369,6 +375,7 @@ MUTATOR_HOOKFUNCTION(nades_BuildMutatorsPrettyString)
 
 MUTATOR_DEFINITION(mutator_nades)
 {
+	MUTATOR_HOOK(ForbidThrowCurrentWeapon, nades_CheckThrow, CBC_ORDER_LAST);
 	MUTATOR_HOOK(VehicleEnter, nades_VehicleEnter, CBC_ORDER_ANY);
 	MUTATOR_HOOK(PlayerPreThink, nades_PlayerPreThink, CBC_ORDER_ANY);
 	MUTATOR_HOOK(PlayerSpawn, nades_PlayerSpawn, CBC_ORDER_ANY);
diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index 713866d97..e2b1fb92d 100644
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -104,8 +104,6 @@ MUTATOR_HOOKFUNCTION(ok_PlayerDies)
 
 MUTATOR_HOOKFUNCTION(ok_ForbidThrowCurrentWeapon)
 {
-	nades_CheckThrow();
-
 	return TRUE;
 }