- Halflife2 support (untested)

git-svn-id: http://svn.code.sf.net/p/xqf/code/trunk@704 d2ac09be-c843-0410-8b1f-f8a84130e0ec
This commit is contained in:
Ludwig Nussel 2005-01-25 19:27:06 +00:00 committed by l-n
parent e4f8700974
commit 8adf9b8147
10 changed files with 80 additions and 1 deletions

View File

@ -1,3 +1,6 @@
Jan 25, 2005: Ludwig Nussel <l-n@users.sourceforge.net>
- Halflife2 support (untested)
Jan 21, 2005: Ludwig Nussel <l-n@users.sourceforge.net>
- highly experimental: optionally use DT_AUXILIARY stub libraries to not depend
on libGeoIP and libgdk_pixbuf at runtime

View File

@ -3,7 +3,7 @@
# Initially written by Markus Fischer <mfischer@josefine.ben.tuwien.ac.at>
#
AC_INIT([XQF],[1.0.2],[xqf-developer@lists.sourceforge.net], [xqf])
AC_INIT([XQF],[1.0.2.1],[xqf-developer@lists.sourceforge.net], [xqf])
AC_CONFIG_SRCDIR([src/xqf.c])
AC_PREREQ(2.52)

View File

@ -2570,6 +2570,11 @@ static int hl_exec (const struct condef *con, int forkit) {
while ((argv[argi] = strtok (NULL, delim)) != NULL)
argi++;
if(con->s->type == HL2_SERVER) // XXX
{
argv[argi++] = "-steam";
}
if (con->gamedir) {
argv[argi++] = "-game";
argv[argi++] = con->gamedir;

View File

@ -331,6 +331,26 @@ struct game games[] = {
identify_os : identify_os,
pd : &hl_private,
},
{
type : HL2_SERVER,
flags : GAME_CONNECT | GAME_PASSWORD,
name : "Half-Life 2",
default_port : 27015,
default_master_port : 27011,
id : "HL2S",
qstat_str : "HL2S",
qstat_option : "-hl2s",
qstat_master_option : "-stmhl2",
icon : "hl2_xpm",
parse_player : hl_parse_player,
parse_server : quake_parse_server,
analyze_serverinfo : hl_analyze_serverinfo,
config_is_valid : config_is_valid_generic,
exec_client : hl_exec,
save_info : quake_save_info,
arch_identifier : "sv_os",
identify_os : identify_os,
},
{
type : KP_SERVER,
flags : GAME_CONNECT | GAME_RCON,

View File

@ -278,6 +278,23 @@
<identify_os>identify_os</identify_os>
<pd>hl_private</pd>
</game>
<game>
<type>HL2_SERVER</type>
<name>Half-Life 2</name>
<flags>GAME_CONNECT | GAME_PASSWORD</flags>
<default_port>27015</default_port>
<default_master_port>27011</default_master_port>
<id>HL2S</id>
<qstat_str>HL2S</qstat_str>
<qstat_option>-hl2s</qstat_option>
<qstat_master_option>-stmhl2</qstat_master_option>
<icon>hl2_xpm</icon>
<parse_player>hl_parse_player</parse_player>
<analyze_serverinfo>hl_analyze_serverinfo</analyze_serverinfo>
<exec_client>hl_exec</exec_client>
<arch_identifier>sv_os</arch_identifier>
<identify_os>identify_os</identify_os>
</game>
<game>
<type>KP_SERVER</type>
<name>Kingpin</name>

View File

@ -53,6 +53,7 @@
#include "xpm/hw.xpm"
#include "xpm/sn.xpm"
#include "xpm/hl.xpm"
#include "xpm/hl2.xpm"
#include "xpm/kp.xpm"
#include "xpm/sfs.xpm"
#include "xpm/sof2s.xpm"

View File

@ -65,3 +65,9 @@ gametype NETPM new extend GSM
master for gametype = NETP
end
gametype STMHL2 new extend STM
name = Steam Master for HL2
template var = STEAMMASTERHL2
master for gametype = HL2S
default port = 27011
end

View File

@ -1068,6 +1068,10 @@ static char *builtin_masters_update_info[] = {
"ADD HLS,-stm master://steam1.steampowered.com Steam 1",
"ADD HLS,-stm master://steam2.steampowered.com Steam 2",
"ADD HL2S,-stmhl2 master://steam1.steampowered.com:27011 Steam 1",
"ADD HL2S,-stmhl2 master://steam2.steampowered.com:27011 Steam 2",
"ADD HL2S,-stmhl2 master://69.28.151.178:27011 Valve 1",
"ADD Q2S:KP http://www.gameaholic.com/servers/qspy-kingpin Gameaholic.Com",
"ADD Q2S:KP http://www.ogn.org:6666 OGN",

22
xqf/src/xpm/hl2.xpm Normal file
View File

@ -0,0 +1,22 @@
/* XPM */
static char *hl2_xpm[]={
"17 17 2 1",
". c None",
"# c #000000",
".................",
".....###########.",
"...##....####..##",
"..#........###.##",
".#..###.....##..#",
".#..###.....#####",
"#.....##.....###.",
"#....###.....###.",
"#...##.##....##..",
"#...##.##....##..",
"#..##...###..#...",
".#.##...###.#....",
".#..........#....",
"..#........#.....",
"...##....##......",
".....####........",
"................."};

View File

@ -109,6 +109,7 @@ enum server_type {
HW_SERVER,
SN_SERVER,
HL_SERVER,
HL2_SERVER,
KP_SERVER,
SFS_SERVER,
SOF2S_SERVER,