Merging broo's changes

Author: estabroo

Makefile.am

@@ -41,7 +41,9 @@ qstat_SOURCES = \
 	farmsim.c farmsim.h \
 	ksp.c ksp.h \
 	tf.c tf.h \
-	armyops.c armyops.h
+	armyops.c armyops.h \
+	skulltag_huffman.c skulltag_huffman.h \
+	zandronum.c zandronum.h
 
 dist_configfiles_DATA = qstat.cfg
 configfilesdir = $(sysconfdir)

Makefile.noauto

@@ -47,7 +47,9 @@ SRC = \
 	farmsim.c \
 	ksp.c \
 	tf.c \
-	armyops.c
+	armyops.c \
+	skulltag_huffman.c \
+	zandronum.c
 
 OBJ = $(SRC:.c=.obj)
 O   = $(SRC:.c=.o)

qstat.h

@@ -127,6 +127,7 @@ typedef query_status_t (*PacketFunc)(struct qserver *, char *rawpkt, int pktlen)
 #include "ksp.h"
 #include "tf.h"
 #include "armyops.h"
+#include "zandronum.h"
 
 /*
  * Various magic numbers.
@@ -273,8 +274,9 @@ typedef query_status_t (*PacketFunc)(struct qserver *, char *rawpkt, int pktlen)
 #define KSP_PROTOCOL_SERVER			77
 #define TF_PROTOCOL_SERVER			78
 #define TEE_MASTER				79
+#define ZANDRONUM_SERVER		80
 
-#define LAST_BUILTIN_SERVER			80
+#define LAST_BUILTIN_SERVER			81
 
 #define TF_SINGLE_QUERY				(1 << 1)
 #define TF_OUTFILE				(1 << 2)
@@ -3751,6 +3753,42 @@ server_type *find_server_type_string(char *type_string);
 			NULL,                           /* player_query_func */
 			deal_with_teemaster_packet,     /* packet_func */
 		},
+		{
+			/* Zandronum server */
+			ZANDRONUM_SERVER,               /* id */
+			"ZAND",                         /* type_prefix */
+			"zand",                         /* type_string */
+			"-zand",                        /* type_option */
+			"Zandronum",                    /* game_name */
+			0,                              /* master */
+			10666,                          /* default_port */
+			0,                              /* port_offset */
+			0,                              /* flags */
+			"gametype",                     /* game_rule */
+			"ZANDRONUM",                    /* template_var */
+			NULL,                           /* status_packet */
+			0,                              /* status_len */
+			NULL,                           /* player_packet */
+			0,                              /* player_len */
+			NULL,                           /* rule_packet */
+			0,                              /* rule_len */
+			NULL,                           /* master_packet */
+			0,                              /* master_len */
+			NULL,                           /* master_protocol */
+			NULL,                           /* master_query */
+			NULL,                           /* display_player_func */
+			NULL,                           /* display_rule_func */
+			NULL,                           /* display_raw_player_func */
+			NULL,                           /* display_raw_rule_func */
+			xml_display_player_info,        /* display_xml_player_func */
+			NULL,                           /* display_xml_rule_func */
+			json_display_player_info,       /* display_json_player_func */
+			NULL,                           /* display_json_rule_func */
+			send_zandronum_request_packet,  /* status_query_func */
+			NULL,                           /* rule_query_func */
+			NULL,                           /* player_query_func */
+			deal_with_zandronum_packet,     /* packet_func */
+		},
 		{
 			Q_UNKNOWN_TYPE, /* id */
 			"",             /* type_prefix */