Merge branch 'Mario/ctf_leadlimit' into 'master'

Merge branch Mario/ctf_leadlimit (XXS merge request)

Sets CTF lead limit to 6, as requested in issue #102.

See merge request !28

diff --combined qcsrc/common/mapinfo.qh
index 3eae41ea676871158176370606ab65bb136be9a3,bc624fdb1bca1d2c778c39c4f4b6b1a7f37130d1..60cd26017d471dda13c1c9ddcf5e96b40cdc9c10
--- 1/qcsrc/common/mapinfo.qh
--- 2/qcsrc/common/mapinfo.qh
+++ b/qcsrc/common/mapinfo.qh
@@@ -50,10 -50,10 +50,10 @@@ REGISTER_GAMETYPE(_("Race CTS"),cts,g_c
  REGISTER_GAMETYPE(_("Team Deathmatch"),tdm,g_tdm,TEAM_DEATHMATCH,"timelimit=20 pointlimit=50 teams=2 leadlimit=0",_("Kill all enemy teammates"));
  #define g_tdm IS_GAMETYPE(TEAM_DEATHMATCH)
  
- REGISTER_GAMETYPE(_("Capture the Flag"),ctf,g_ctf,CTF,"timelimit=20 caplimit=10 leadlimit=0",_("Find and bring the enemy flag to your base to capture it"));
+ REGISTER_GAMETYPE(_("Capture the Flag"),ctf,g_ctf,CTF,"timelimit=20 caplimit=10 leadlimit=6",_("Find and bring the enemy flag to your base to capture it"));
  #define g_ctf IS_GAMETYPE(CTF)
  
 -REGISTER_GAMETYPE(_("Clan Arena"),ca,g_ca,CA,"timelimit=20 pointlimit=10 leadlimit=0",_("Kill all enemy teammates to win the round"));
 +REGISTER_GAMETYPE(_("Clan Arena"),ca,g_ca,CA,"timelimit=20 pointlimit=10 teams=2 leadlimit=0",_("Kill all enemy teammates to win the round"));
  #define g_ca IS_GAMETYPE(CA)
  
  REGISTER_GAMETYPE(_("Domination"),dom,g_domination,DOMINATION,"timelimit=20 pointlimit=200 teams=2 leadlimit=0",_("Capture all the control points to win"));
@@@ -80,7 -80,7 +80,7 @@@ REGISTER_GAMETYPE(_("Keepaway"),ka,g_ke
  REGISTER_GAMETYPE(_("Invasion"),inv,g_invasion,INVASION,"pointlimit=50 teams=0",_("Survive against waves of monsters"));
  #define g_invasion IS_GAMETYPE(INVASION)
  
 -const float MAPINFO_FEATURE_WEAPONS       = 1; // not defined for minstagib-only maps
 +const float MAPINFO_FEATURE_WEAPONS       = 1; // not defined for instagib-only maps
  const float MAPINFO_FEATURE_VEHICLES      = 2;
  const float MAPINFO_FEATURE_TURRETS       = 4;
  const float MAPINFO_FEATURE_MONSTERS      = 8;