From: Mario Date: Sat, 13 Dec 2014 05:37:47 +0000 (+0000) Subject: Merge branch 'Mario/ctf_leadlimit' into 'master' X-Git-Tag: xonotic-v0.8.0~112 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b03338e49b3b16ec20c59a9809abe16bebcd29ce;p=xonotic%2Fxonotic-data.pk3dir.git 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 --- b03338e49b3b16ec20c59a9809abe16bebcd29ce diff --cc qcsrc/common/mapinfo.qh index 3eae41ea6,bc624fdb1..60cd26017 --- a/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"));