From: Samual Lenks <samual@xonotic.org>
Date: Mon, 10 Sep 2012 22:36:17 +0000 (-0400)
Subject: Clean some things up and add a better description for a cvar
X-Git-Tag: xonotic-v0.7.0~240^2~2
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=25d69fa7e4fe74a2f74f5ec25ad29bbee15bcf6b

Clean some things up and add a better description for a cvar
---

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 1f72fe47a..2901efd0b 100644
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -178,7 +178,6 @@ set g_ctf_flag_return_dropped 100
 set g_ctf_flag_return_damage 0
 set g_ctf_flag_return_when_unreachable 1 "automatically return the flag if it falls into lava/slime/trigger hurt"
 set g_ctf_flagcarrier_auto_helpme_when_damaged 100
-set g_ctf_flagcarrier_allow_vehicle_carry 1 
 set g_ctf_flagcarrier_selfdamagefactor 1
 set g_ctf_flagcarrier_selfforcefactor 1
 set g_ctf_flagcarrier_damagefactor 1
@@ -204,7 +203,8 @@ set g_ctf_pass_request 1 "allow players to request the flag carrier to pass the
 set g_ctf_pass_turnrate 50 "how well the flag follows the best direction to its target while passing"
 set g_ctf_pass_timelimit 2 "how long a flag can stay trying to pass before it gives up and just becomes dropped"
 set g_ctf_pass_velocity 750 "how fast or far a player can pass the flag"
-set g_ctf_allow_vehicle_touch 0 "allow flags to be picked up/captured/returned from inside a vehicle
+set g_ctf_allow_vehicle_touch 0 "allow flags to be picked up/captured/returned without even leaving the vehicle"
+set g_ctf_allow_vehicle_carry 1 "allow players to hold flags inside a vehicle"
 
 set g_ctf_shield_max_ratio 0	"shield at most this percentage of a team from the enemy flag (try: 0.4 for 40%)"
 set g_ctf_shield_min_negscore 20	"shield the player from the flag if he's got this negative amount of points or less"
@@ -217,7 +217,7 @@ set g_ctf_flag_blue_skin 1
 set g_ctf_flag_glowtrails 1
 set g_ctf_fullbrightflags 0
 set g_ctf_dynamiclights 0
-set g_ctf_captimerecord_always 0 "if enabled, assisted CTF records (with other players on the server) are recorded too"
+set g_ctf_captimerecord_always 0 "always show capture time information when someone captures the flag"
 
 seta g_ctf_ignore_frags 0	"1: regular frags give no points"
 exec ctfscoring-samual.cfg
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 75a2e33c7..a3687f959 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -760,6 +760,7 @@ float autocvar_g_chat_flood_spl_team;
 float autocvar_g_chat_flood_spl_tell;
 float autocvar_g_chat_nospectators;
 float autocvar_g_chat_teamcolors;
+float autocvar_g_ctf_allow_vehicle_carry;
 float autocvar_g_ctf_allow_vehicle_touch;
 float autocvar_g_ctf_drop;
 float autocvar_g_ctf_drop_strengthmultiplier;
@@ -790,7 +791,6 @@ float autocvar_g_ctf_flag_return_when_unreachable;
 float autocvar_g_ctf_flag_return_damage;
 float autocvar_g_ctf_flag_return_dropped;
 float autocvar_g_ctf_flagcarrier_auto_helpme_when_damaged;
-float autocvar_g_ctf_flagcarrier_allow_vehicle_carry;
 float autocvar_g_ctf_flagcarrier_selfdamagefactor;
 float autocvar_g_ctf_flagcarrier_selfforcefactor;
 float autocvar_g_ctf_flagcarrier_damagefactor;
diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 7556c6e9f..b40ddb138 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -1824,7 +1824,7 @@ MUTATOR_HOOKFUNCTION(ctf_VehicleEnter)
 {
 	if(vh_player.flagcarried)
 	{
-		if(!autocvar_g_ctf_flagcarrier_allow_vehicle_carry)
+		if(!autocvar_g_ctf_allow_vehicle_carry)
 		{
 			ctf_Handle_Throw(vh_player, world, DROP_NORMAL);
 		}