Clean up even more

diff --git a/qcsrc/server/mutators/gamemode_ctf.qh b/qcsrc/server/mutators/gamemode_ctf.qh
index b5ff1774a136441373a9ba2d4250a3b48f187bb7..2a8b4818c0a140d0a850220ee17062f22b7b7ef9 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qh
+++ b/qcsrc/server/mutators/gamemode_ctf.qh
@@ -93,8 +93,6 @@ const int RETURN_DAMAGE = 3;
 const int RETURN_SPEEDRUN = 4;
 const int RETURN_NEEDKILL = 5;
 
-void ctf_Handle_Throw(entity player, entity receiver, float droptype);
-
 // flag properties
 #define ctf_spawnorigin dropped_origin
 bool ctf_stalemate; // indicates that a stalemate is active

diff --git a/qcsrc/server/mutators/gamemode_keyhunt.qh b/qcsrc/server/mutators/gamemode_keyhunt.qh
index 3fa347ea618b7e027336050f05495829122d6f35..2d96b2fa25dc5f217d3f58d1dc2f33afc13330eb 100644 (file)
--- a/qcsrc/server/mutators/gamemode_keyhunt.qh
+++ b/qcsrc/server/mutators/gamemode_keyhunt.qh
@@ -14,8 +14,6 @@ typedef void(void) kh_Think_t;
 void kh_StartRound();
 void kh_Controller_SetThink(float t, kh_Think_t func);
 
-void kh_Key_DropAll(entity player, float suicide);
-
 entity kh_worldkeylist;
 .entity kh_worldkeynext;
 

diff --git a/qcsrc/server/mutators/mutator_buffs.qc b/qcsrc/server/mutators/mutator_buffs.qc
index 42c7294770038aa2a02f7fa8d41fc01ea1d28097..80de63c95de2231869802bc8685cd9d335e546dd 100644 (file)
--- a/qcsrc/server/mutators/mutator_buffs.qc
+++ b/qcsrc/server/mutators/mutator_buffs.qc
@@ -649,11 +649,7 @@ MUTATOR_HOOKFUNCTION(buffs, ForbidThrowCurrentWeapon)
                        their_vel = closest.velocity;
                        their_ang = closest.angles;
 
-                       if(closest.ballcarried)
-                       if(g_keepaway) { ka_DropEvent(closest); }
-                       else { DropBall(closest.ballcarried, closest.origin, closest.velocity);}
-                       if(closest.flagcarried) { ctf_Handle_Throw(closest, world, DROP_THROW); }
-                       if(closest.nade) { toss_nade(closest, '0 0 0', time + 0.05); }
+                       Drop_Special_Items(closest);
 
                        MUTATOR_CALLHOOK(PortalTeleport, self); // initiate flag dropper
 

diff --git a/qcsrc/server/mutators/mutator_nades.qh b/qcsrc/server/mutators/mutator_nades.qh
index 1a0dd525219746daed442a03390328ebdff05f62..8f571b8287788ba4448c84b10cd835ad33f43921 100644 (file)
--- a/qcsrc/server/mutators/mutator_nades.qh
+++ b/qcsrc/server/mutators/mutator_nades.qh
@@ -18,8 +18,6 @@
 .float stat_healing_orb_alpha;
 .float nade_show_particles;
 
-void toss_nade(entity e, vector _velocity, float _time);
-
 // Remove nades that are being thrown
 void(entity player) nades_Clear;