From 6783a38ef9ee6e03d42810e8ce33ae28035c8866 Mon Sep 17 00:00:00 2001 From: Samual Date: Sat, 31 Mar 2012 16:53:26 -0400 Subject: [PATCH] Quick fixes --- qcsrc/server/mutators/gamemode_ctf.qc | 4 ++-- qcsrc/server/mutators/gamemode_ctf.qh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc index 5bce0fd4d..b89d5db1d 100644 --- a/qcsrc/server/mutators/gamemode_ctf.qc +++ b/qcsrc/server/mutators/gamemode_ctf.qc @@ -604,7 +604,7 @@ void ctf_FlagThink() case FLAG_PASSING: { dprint("Someone touched a flag even though it was being carried?\n"); - break; + return; } default: // this should never happen @@ -907,7 +907,7 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey) if(head != player && !IsDifferentTeam(head, player)) if(!player.speedrunning && !head.speedrunning) { - if(autocvar_g_ctf_pass_request && head.flagcarried) + if(autocvar_g_ctf_pass_request && !player.flagcarried && head.flagcarried) { centerprint(head, strcat(player.netname, " requests you to pass the ", head.flagcarried.netname)); player.pass_antispam = time + autocvar_g_ctf_pass_wait; diff --git a/qcsrc/server/mutators/gamemode_ctf.qh b/qcsrc/server/mutators/gamemode_ctf.qh index 6d80ffdf4..ce39a04df 100644 --- a/qcsrc/server/mutators/gamemode_ctf.qh +++ b/qcsrc/server/mutators/gamemode_ctf.qh @@ -54,8 +54,8 @@ entity ctf_worldflaglist; // statuses #define FLAG_BASE 1 -#define FLAG_CARRY 2 -#define FLAG_DROPPED 3 +#define FLAG_DROPPED 2 +#define FLAG_CARRY 3 #define FLAG_PASSING 4 #define DROPTYPE_NORMAL 1 -- 2.39.2