Support for Extended Status and Rules queries

.gitignore

@@ -8,4 +8,6 @@
 build.sh
 /build_win
 clang-build.sh
-/bots
+/bots
+/dev
+.DS_Store

doc/action.md

@@ -571,7 +571,7 @@ For the lazy players under us, we have created three new commands to make things
 **Commands:**
 - `auto_join [0/1/2]` - when on (1), the players will automatically join the team he was in during the last map. If set to 2, it will automatically join the team with the least players, or randomly if equal.
 - `auto_equip [0/1]` - when on (1), the players will automatically be given the equipment he had during the last map.
-- `auto_menu [0/1]` - when on (1), the menu will automatically open when you join the server.
+- `auto_menu [0/1/2]` - when on (1), the menu will automatically open when you join the server. when set to (2), it will automatically render the menu AFTER the MOTD renders
 
 ### Automatic Demo Recording
 To ease the recording of demos by a client over several maps, we have implemented a feature which will let the client automatically record a demo on each new map. When enabled, the server will keep track of the recording of the client, and will create a demo of the map with the following name: date_time-map.dm2 In matchmode, the demo's name will be: date_time-team1_vs_team2-map.dm2

inc/common/cvar.h

@@ -49,7 +49,7 @@ interface from being ambiguous.
 #define CVAR_INFOMASK       (CVAR_USERINFO | CVAR_SERVERINFO)
 #define CVAR_MODIFYMASK     (CVAR_INFOMASK | CVAR_FILES | CVAR_REFRESH | CVAR_SOUND)
 #define CVAR_NOARCHIVEMASK  (CVAR_NOSET | CVAR_CHEAT | CVAR_PRIVATE | CVAR_ROM | CVAR_NOARCHIVE)
-#define CVAR_EXTENDED_MASK  (~MASK(5))
+#define CVAR_EXTENDED_MASK  ((~MASK(5)) & ~CVAR_SERVERINFO_EXT)
 
 extern cvar_t   *cvar_vars;
 extern int      cvar_modified;

inc/shared/shared.h

@@ -907,12 +907,13 @@ CVARS (console variables)
 #ifndef CVAR
 #define CVAR
 
-#define CVAR_ARCHIVE    BIT(0)  // set to cause it to be saved to vars.rc
-#define CVAR_USERINFO   BIT(1)  // added to userinfo when changed
-#define CVAR_SERVERINFO BIT(2)  // added to serverinfo when changed
-#define CVAR_NOSET      BIT(3)  // don't allow change from console at all,
-                                // but can be set from the command line
-#define CVAR_LATCH      BIT(4)  // save changes until server restart
+#define CVAR_ARCHIVE        BIT(0)  // set to cause it to be saved to vars.rc
+#define CVAR_USERINFO       BIT(1)  // added to userinfo when changed
+#define CVAR_SERVERINFO     BIT(2)  // added to serverinfo when changed
+#define CVAR_NOSET          BIT(3)  // don't allow change from console at all,
+                                    // but can be set from the command line
+#define CVAR_LATCH          BIT(4)  // save changes until server restart
+#define CVAR_SERVERINFO_EXT BIT(16) // queryable via rulesext protocol
 
 #if USE_CLIENT || USE_SERVER
 struct cvar_s;

src/action/a_ctf.c

@@ -791,6 +791,10 @@ qboolean CTFPickup_Flag(edict_t * ent, edict_t * other)
 				else
 					ctfgame.team2++;
 
+				// Update team scores
+				teams[TEAM1].score = ctfgame.team1;
+				teams[TEAM2].score = ctfgame.team2;
+
 				CTFDynamicRespawnTimer(); // Dynamic respawn time
 
 				gi.sound(ent, CHAN_RELIABLE + CHAN_NO_PHS_ADD + CHAN_VOICE,