Merge remote-tracking branch 'origin/master' into samual/serverlist

diff --combined defaultXonotic.cfg
index 7ba487f6efb94f069e68532bc9721f045e4ab2f1,49f43333c1b0487c5b65024c19bb63b5fde20bfe..64a542c8636a336c59b6f204759ad841d374ff1e
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -237,7 -237,7 +237,7 @@@ set g_maxplayers_spectator_blocktime 5     
  set g_warmup 0        "split the game into a warmup- and match-stage when set to 1"
  set g_warmup_limit 0  "if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage, otherwise warmup will be limited to this time in SECONDS (useful for public matches)"
  set g_warmup_allow_timeout 0  "if set to 1 timeouts can also be called in the warmup-stage, when sv_timeout is set to 1"
- set g_warmup_allguns 1        "if set players start with all guns in warmup mode"
+ set g_warmup_allguns 1        "provide more weapons on start while in warmup: 0 = normal start weapons, 1 = all guns available on the map, 2 = all normal weapons"
  set g_warmup_majority_factor 0.8 "minimum percentage of players ready needed for warmup to end"
  
  set g_chat_nospectators 0     "if 0 spec/observer chat is always visible to the player, if 1 it is never visible to players, if 2 it is only visible to players during warmup stage"
@@@ -978,28 -978,6 +978,28 @@@ seta menu_slist_showfull 1 "show server
  seta menu_slist_showempty 1 "show servers even if they are no empty and have no opponents to play against"
  seta menu_slist_modfilter "" // set to either: !modname or modname. modname of = means "same as we are running now".
  
 +// other serverlist cvars
 +seta menu_slist_categories 1
 +seta menu_slist_categories_onlyifmultiple 1
 +seta menu_slist_purethreshold 0
 +seta menu_slist_modimpurity 0
 +seta menu_slist_recommendations 3
 +seta menu_slist_recommendations_maxping 150
 +seta menu_slist_recommendations_minfreeslots 1
 +seta menu_slist_recommendations_minhumans 0
 +seta menu_slist_recommendations_purethreshold -1
 +
 +// serverlist category override cvars
 +seta menu_slist_categories_CAT_FAVORITED_override ""
 +seta menu_slist_categories_CAT_RECOMMENDED_override ""
 +seta menu_slist_categories_CAT_NORMAL_override ""
 +seta menu_slist_categories_CAT_SERVERS_override "CAT_NORMAL"
 +seta menu_slist_categories_CAT_XPM_override "CAT_NORMAL"
 +seta menu_slist_categories_CAT_MODIFIED_override ""
 +seta menu_slist_categories_CAT_OVERKILL_override ""
 +seta menu_slist_categories_CAT_MINSTAGIB_override ""
 +seta menu_slist_categories_CAT_DEFRAG_override ""
 +
  seta menu_weaponarena ""
  
  seta menu_maxplayers 16 "maxplayers value when the menu starts a game"
@@@ -1436,7 -1414,7 +1436,7 @@@ sv_cullentities_trace 
  r_cullentities_trace 0
  
  // less "lagging" of other players, but also less PL tolerant... let's try this
- sv_clmovement_inputtimeout 0.07 // more than 2, less than 3 server frames
+ sv_clmovement_inputtimeout 0.04 // more than 1, less than 2 server frames
  
  // exact gloss looks better, e.g. on g-23
  r_shadow_glossexact 1

diff --combined qcsrc/common/util.qh
index 10920c3a891cae60320606beac394656ee702626,166af391e9574b7d6e5e7f7867bab05ab43c2e7f..effdb3cf7823ff8089ed0099a1808fd5e37e3e11
--- 1/qcsrc/common/util.qh
--- 2/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@@ -6,6 -6,12 +6,12 @@@
  // a dummy macro that prevents the "hanging ;" warning
  #define ENDS_WITH_CURLY_BRACE
  
+ #ifdef GMQCC
+ # define ACCUMULATE_FUNCTION(func,otherfunc) \
+       [[accumulate]] void func() { otherfunc(); }
+ # define CALL_ACCUMULATED_FUNCTION(func) \
+       func()
+ #else
  #ifdef HAVE_YO_DAWG_CPP
  // TODO make ascii art pic of xzibit
  // YO DAWG!
@@@ -41,11 -47,12 +47,12 @@@ void ACCUMULATE_call(string func
  # define CALL_ACCUMULATED_FUNCTION(func) \
        ACCUMULATE_call(#func)
  #endif
+ #endif
  
  // used for simplifying ACCUMULATE_FUNCTIONs
  #define SET_FIRST_OR_LAST(input,first,count) if(!input) { input = (first + count); }
  #define SET_FIELD_COUNT(field,first,count) if(!field) { field = (first + count); ++count; }
 -#define CHECK_MAX_COUNT(name,max,count,type) if(count == max) { error(strcat("Maximum ", type, " hit: ", #name, ": ", ftos(count), ".\n")); }
 +#define CHECK_MAX_COUNT(name,max,count,type) if(count > max) { error(strcat("Maximum ", type, " hit: ", #name, ": ", ftos(count), ".\n")); }
  
  // this returns a tempstring containing a copy of s with additional \n newlines added, it also replaces \n in the text with a real newline
  // NOTE: s IS allowed to be a tempstring