From 0f8b245e550a4e7ff328b8325d3fed2bf5014636 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 15 Oct 2015 00:58:02 +1000 Subject: [PATCH] Clean up even more --- qcsrc/server/mutators/gamemode_ctf.qh | 2 -- qcsrc/server/mutators/gamemode_keyhunt.qh | 2 -- qcsrc/server/mutators/mutator_buffs.qc | 6 +----- qcsrc/server/mutators/mutator_nades.qh | 2 -- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/qcsrc/server/mutators/gamemode_ctf.qh b/qcsrc/server/mutators/gamemode_ctf.qh index b5ff1774a..2a8b4818c 100644 --- 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 3fa347ea6..2d96b2fa2 100644 --- 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 42c729477..80de63c95 100644 --- 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 1a0dd5252..8f571b828 100644 --- 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; -- 2.39.2