From: Matthias Krüger Date: Sat, 14 Sep 2013 08:47:05 +0000 (+0200) Subject: Merge branch 'master' into matthiaskrgr/hudsetup X-Git-Tag: xonotic-v0.8.1~94^2~6 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=46ab0565581b318ba02e7f9e9ddf879e90b8d452;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into matthiaskrgr/hudsetup Conflicts: qcsrc/common/mapinfo.qh --- 46ab0565581b318ba02e7f9e9ddf879e90b8d452 diff --cc qcsrc/common/mapinfo.qh index 9f39eafc2,db08fdf07..c288b008e --- a/qcsrc/common/mapinfo.qh +++ b/qcsrc/common/mapinfo.qh @@@ -78,14 -78,13 +78,14 @@@ REGISTER_GAMETYPE(_("Freeze Tag"),ft,g_ REGISTER_GAMETYPE(_("Keepaway"),ka,g_keepaway,KEEPAWAY,"timelimit=20 pointlimit=30") #define g_keepaway IS_GAMETYPE(KEEPAWAY) - float MAPINFO_FEATURE_WEAPONS = 1; // not defined for minstagib-only maps - float MAPINFO_FEATURE_VEHICLES = 2; - float MAPINFO_FEATURE_TURRETS = 4; - - float MAPINFO_FLAG_HIDDEN = 1; // not in lsmaps/menu/vcall/etc., can just be changed to manually - float MAPINFO_FLAG_FORBIDDEN = 2; // don't even allow the map by a cvar setting that allows hidden maps - float MAPINFO_FLAG_FRUSTRATING = 4; // this map is near impossible to play, enable at your own risk - float MAPINFO_FLAG_NOAUTOMAPLIST = 8; // do not include when automatically building maplist (counts as hidden for maplist building purposes) + const float MAPINFO_FEATURE_WEAPONS = 1; // not defined for minstagib-only maps + const float MAPINFO_FEATURE_VEHICLES = 2; + const float MAPINFO_FEATURE_TURRETS = 4; + + const float MAPINFO_FLAG_HIDDEN = 1; // not in lsmaps/menu/vcall/etc., can just be changed to manually + const float MAPINFO_FLAG_FORBIDDEN = 2; // don't even allow the map by a cvar setting that allows hidden maps + const float MAPINFO_FLAG_FRUSTRATING = 4; // this map is near impossible to play, enable at your own risk ++const float MAPINFO_FLAG_NOAUTOMAPLIST = 8; // do not include when automatically building maplist (counts as hidden for maplist building purposes) float MapInfo_count;