Merge remote branch 'origin/master' into tzork/vehicles-2

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / ctf.qc

diff --git a/qcsrc/server/ctf.qc b/qcsrc/server/ctf.qc
index fea1ef410cba7edd912179e0a7ec7bf0c6ca39a7..09cb6c56819230111c91b70f7131ae2c0144026b 100644 (file)
--- a/qcsrc/server/ctf.qc
+++ b/qcsrc/server/ctf.qc
@@ -405,12 +405,18 @@ void FlagThink()
                DropFlag(self, world, world);
                return;
        }
-
-       if(autocvar_g_ctf_allow_drop)
-       if(e.BUTTON_USE)
-               DropFlag(self, e, world);
 };
 
+float ctf_usekey()
+{
+       if(self.flagcarried)
+       {
+               DropFlag(self.flagcarried, self, world);
+               return TRUE;
+       }
+       return FALSE;
+}
+
 void flag_cap_ring_spawn(vector org)
 {
        shockwave_spawn("models/ctf/shockwavetransring.md3", org - '0 0 15', -0.8, 0, 1);