From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 23 Sep 2013 15:23:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/divVerent/noautomaplist'
X-Git-Tag: xonotic-v0.8.0~323
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1ea3b0365fd6fbb31c38cf6d22ee0b952e9010c1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/divVerent/noautomaplist'

Conflicts:
	qcsrc/common/mapinfo.qh
---

1ea3b0365fd6fbb31c38cf6d22ee0b952e9010c1
diff --cc qcsrc/common/mapinfo.qh
index db08fdf07,9f39eafc2..c288b008e
--- a/qcsrc/common/mapinfo.qh
+++ b/qcsrc/common/mapinfo.qh
@@@ -78,13 -78,14 +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;