"publicserver 2" for public coop servers which allow setmaster but di…

…sallow private

git-svn-id: https://sauerbraten.svn.sourceforge.net/svnroot/sauerbraten@1733 ac1f7847-fce6-4368-a212-70e9bdee79d4

server-init.cfg

@@ -14,6 +14,7 @@ serverbotlimit 8
 // controls whether or not the server is intended for "public" use
 // when set to 0, allows "setmaster 1" and locked/private mastermodes (for coop-editing and such)
 // when set to 1, can only gain master by "auth" or admin, and doesn't allow locked/private mastermodes
+// when set to 2, allows "setmaster 1" but disallows private mastermode (for public coop-editing)
 publicserver 0
 
 // description server shows for the server browser

src/fpsgame/server.cpp

@@ -312,6 +312,7 @@ namespace server
     #define MM_AUTOAPPROVE 0x1000
     #define MM_PRIVSERV (MM_MODE | MM_AUTOAPPROVE)
     #define MM_PUBSERV ((1<<MM_OPEN) | (1<<MM_VETO))
+    #define MM_COOPSERV (MM_AUTOAPPROVE | MM_PUBSERV | (1<<MM_LOCKED))
 
     bool notgotitems = true;        // true when map has changed and waiting for clients to send item
     int gamemode = 0;
@@ -386,7 +387,14 @@ namespace server
     SVAR(serverdesc, "");
     SVAR(serverpass, "");
     SVAR(adminpass, "");
-    VARF(publicserver, 0, 0, 1, { mastermask = publicserver ? MM_PUBSERV : MM_PRIVSERV; });
+    VARF(publicserver, 0, 0, 2, {
+		switch(publicserver)
+		{
+			case 0: default: mastermask = MM_PRIVSERV; break;
+			case 1: mastermask = MM_PUBSERV; break;
+			case 2: mastermask = MM_COOPSERV; break;
+		}
+	});
     SVAR(servermotd, "");
 
     void *newclientinfo() { return new clientinfo; }