Quick fixes

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 5bce0fd4d0b8cf4098d817f6a0e3e2e6ecf60420..b89d5db1da125135c70b5d795acfa8b3fa29e181 100644 (file)
--- 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 6d80ffdf49590d887b26344de9ec764fc5080b42..ce39a04df1392871bb2faf7d1ae1333b12c0cc33 100644 (file)
--- 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