Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zandronum support #121

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+1,094 −3
Open

Zandronum support #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdee52c
Merging broo's changes
estabroo Jun 19, 2019
09e2871
Merge branch 'master' of https://github.com/multiplay/qstat
Kr3m Mar 23, 2020
1235019
Merge remote-tracking branch 'refs/remotes/origin/master'
Kr3m Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,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)
Expand Down
4 changes: 3 additions & 1 deletion Makefile.noauto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ SRC = \
farmsim.c \
ksp.c \
tf.c \
armyops.c
armyops.c \
skulltag_huffman.c \
zandronum.c

SOURCES = \
version.h \
Expand Down
40 changes: 39 additions & 1 deletion qstat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,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.
Expand Down Expand Up @@ -270,8 +271,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)
Expand Down Expand Up @@ -3748,6 +3750,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 */
Expand Down
Loading