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

Conflicts:
	qcsrc/common/mapinfo.qh

diff --cc qcsrc/common/mapinfo.qc
Simple merge

diff --cc qcsrc/common/mapinfo.qh
index db08fdf07c6a71116099cfa384d325ba19230ac6,9f39eafc21a92e667762a74ceeb2b9a89f08f898..c288b008eab8adf8af07cb4fac07241cfadc461a
--- 1/qcsrc/common/mapinfo.qh
--- 2/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;
  

diff --cc qcsrc/server/g_world.qc
Simple merge