From ef2a8445624902aecba00ed619023e3613825621 Mon Sep 17 00:00:00 2001
From: Jakob MG <jakob_mg@hotmail.com>
Date: Sun, 12 Jun 2011 19:15:22 +0200
Subject: [PATCH] Support g_vehicles_allow_flagcarry to (dis)allow flag carry
in vehicles
---
qcsrc/server/vehicles/vehicles.qc | 12 +++++++++---
vehicles.cfg | 1 +
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 8a5e3f81b..da26423a8 100644
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -2,6 +2,7 @@ float autocvar_g_vehicles_crush_dmg;
float autocvar_g_vehicles_crush_force;
float autocvar_g_vehicles_delayspawn;
float autocvar_g_vehicles_delayspawn_jitter;
+float autocvar_g_vehicles_allow_flagcarry;
void vehicles_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force);
void vehicles_return();
@@ -500,9 +501,14 @@ void vehicles_enter()
if(other.flagcarried)
{
- other.flagcarried.scale = 1;
- setattachment(other.flagcarried, self, "");
- setorigin(other, '0 0 96');
+ if(!autocvar_g_vehicles_allow_flagcarry)
+ DropFlag(other.flagcarried, world, world);
+ else
+ {
+ other.flagcarried.scale = 1;
+ setattachment(other.flagcarried, self, "");
+ setorigin(other, '0 0 96');
+ }
}
self.vehicle_enter();
diff --git a/vehicles.cfg b/vehicles.cfg
index 4d0642928..f225b69f0 100644
--- a/vehicles.cfg
+++ b/vehicles.cfg
@@ -16,3 +16,4 @@ set cl_vehicles_hudscale 0.5
set g_vehicles_delayspawn 0
set g_vehicles_delayspawn_jitter 10
+set g_vehicles_allow_flagcarry 1
--
2.39.5