From: Samual <samual@xonotic.org>
Date: Sat, 31 Mar 2012 20:53:26 +0000 (-0400)
Subject: Quick fixes
X-Git-Tag: xonotic-v0.7.0~240^2~134
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6783a38ef9ee6e03d42810e8ce33ae28035c8866;p=xonotic%2Fxonotic-data.pk3dir.git

Quick fixes
---

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