Merge remote-tracking branch 'remotes/origin/next' into release_v1.3

source/src/cube.h

@@ -43,8 +43,7 @@ extern vector<entity> ents;             // map entities
 extern vec worldpos, camup, camright, camdir; // current target of the crosshair in the world
 extern int lastmillis, totalmillis, skipmillis; // last time
 extern int curtime;                     // current frame time
-extern int interm;
-extern int gamemode, nextmode;
+extern int gamemode;
 extern int gamespeed;
 extern int xtraverts;
 extern float fovy, aspect;
@@ -61,7 +60,7 @@ extern float waterlevel;
 #define AC_VERSION 1202
 #define AC_MASTER_URI "ms.cubers.net"
 #define AC_MASTER_PORT 28760
-#define MAXCL 16
+#define MAXCLIENTSONMASTER 16           // FIXME
 #define CONFIGROTATEMAX 5               // keep 5 old versions of saved.cfg and init.cfg around
 
 #define DEFAULT_FOG 180