Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --combined qcsrc/server/g_world.qc
index 5b28212583fa117487b4c9340f541b2c8dc2d7c0,d6a39859ea1492e20db693de97b72ac7ef2ee0d7..6f318e27e623ab88338d7017f228dbe65e3b89a2
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -961,7 -961,7 +961,7 @@@ string GetMapname(
  float Map_Count, Map_Current;
  string Map_Current_Name;
  
 -// NOTE: this now expects the map list to be already tokenize()d and the count in Map_Count
 +// NOTE: this now expects the map list to be already tokenized and the count in Map_Count
  float GetMaplistPosition()
  {
        float pos, idx;
@@@ -1345,9 -1345,8 +1345,8 @@@ void IntermissionThink(
  {
        FixIntermissionClient(self);
  
-       if(autocvar_sv_autoscreenshot)
-       if(self.autoscreenshot > 0)
-       if(time > self.autoscreenshot)
+       if( (autocvar_sv_autoscreenshot || self.cvar_cl_autoscreenshot)
+               && ((self.autoscreenshot > 0) && (time > self.autoscreenshot)) )
        {
                self.autoscreenshot = -1;
                if(clienttype(self) == CLIENTTYPE_REAL)