XQF/xqf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

urban terror recognition in q3 servers list, master server list updates, etc.

Browse Source
This commit is contained in:
Thomas Debesse 2013-10-30 05:04:47 +01:00 committed by Thomas Debesse
parent afdedb66e8
commit b9b61fe071
5 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game.c
View File

@ -1647,6 +1647,10 @@ static void q3_analyze_serverinfo (struct server *s) {
{ {
s->type=REACTION_SERVER; s->type=REACTION_SERVER;
} }
else if(!strncmp(game,"q3ut4",5))
{
s->type=IOURT_SERVER;
}
} }
else if(gamename) else if(gamename)
{ {

8
src/games.c
View File

@ -57,7 +57,7 @@ static char* stringlist054[] = { "openttd", NULL };
static char* stringlist055[] = { "baseq3", NULL }; static char* stringlist055[] = { "baseq3", NULL };
static char* stringlist056[] = { "q3rally", NULL }; static char* stringlist056[] = { "q3rally", NULL };
static char* stringlist057[] = { "q3ut4", NULL }; static char* stringlist057[] = { "q3ut4", NULL };
static char* stringlist058[] = { "ioUrbanTerror", NULL }; static char* stringlist058[] = { "ioUrbanTerror", "Quake3-UrT", "urbanterror", NULL };
static char* stringlist059[] = { "rq3", NULL }; static char* stringlist059[] = { "rq3", NULL };
static char* stringlist060[] = { "Reaction", NULL }; static char* stringlist060[] = { "Reaction", NULL };
static char* stringlist061[] = { "smokinguns", NULL }; static char* stringlist061[] = { "smokinguns", NULL };
@ -153,7 +153,7 @@ struct game games[] = {
{ {
type : Q3_SERVER, type : Q3_SERVER,
flags : GAME_CONNECT | GAME_PASSWORD | GAME_RCON | GAME_QUAKE3_MASTERPROTOCOL | GAME_Q3COLORS, flags : GAME_CONNECT | GAME_PASSWORD | GAME_RCON | GAME_QUAKE3_MASTERPROTOCOL | GAME_Q3COLORS,
name : "Quake3: Arena", name : "Quake Ⅲ Arena",
default_port : 27960, default_port : 27960,
default_master_port : 27950, default_master_port : 27950,
id : "Q3S", id : "Q3S",
@ -1135,7 +1135,7 @@ struct game games[] = {
{ {
type : IOURT_SERVER, type : IOURT_SERVER,
flags : GAME_CONNECT | GAME_PASSWORD | GAME_RCON | GAME_QUAKE3_MASTERPROTOCOL | GAME_Q3COLORS, flags : GAME_CONNECT | GAME_PASSWORD | GAME_RCON | GAME_QUAKE3_MASTERPROTOCOL | GAME_Q3COLORS,
name : "ioUrbanTerror", name : "UrbanTerror",
default_port : 27960, default_port : 27960,
default_master_port : 27950, default_master_port : 27950,
id : "IOURTS", id : "IOURTS",
@ -1159,7 +1159,7 @@ struct game games[] = {
cmd_or_dir_changed : tremulous_cmd_or_dir_changed, cmd_or_dir_changed : tremulous_cmd_or_dir_changed,
prefs_load : q3_prefs_load_common, prefs_load : q3_prefs_load_common,
update_prefs : tremulous_update_prefs, update_prefs : tremulous_update_prefs,
default_home : "~/.ioUrbanTerror", default_home : "~/.q3a",
pd : &iourt_private, pd : &iourt_private,
main_mod : stringlist057, main_mod : stringlist057,
command : stringlist058, command : stringlist058,

10
src/games.xml
View File

@ -123,7 +123,7 @@
<game> <game>
<type>Q3_SERVER</type> <type>Q3_SERVER</type>
<flags>GAME_CONNECT | GAME_PASSWORD | GAME_RCON | GAME_QUAKE3_MASTERPROTOCOL | GAME_Q3COLORS</flags> <flags>GAME_CONNECT | GAME_PASSWORD | GAME_RCON | GAME_QUAKE3_MASTERPROTOCOL | GAME_Q3COLORS</flags>
<name>Quake3: Arena</name> <name>Quake Ⅲ Arena</name>
<default_port>27960</default_port> <default_port>27960</default_port>
<default_master_port>27950</default_master_port> <default_master_port>27950</default_master_port>
<id>Q3S</id> <id>Q3S</id>
@ -216,7 +216,6 @@
<main_mod>etmain</main_mod> <main_mod>etmain</main_mod>
<pd>wolfet_private</pd> <pd>wolfet_private</pd>
</game> </game>
<game> <game>
<base>Q3_SERVER</base> <base>Q3_SERVER</base>
<type>DOOM3_SERVER</type> <type>DOOM3_SERVER</type>
@ -244,7 +243,6 @@
<attributes>+rconpassword</attributes> <attributes>+rconpassword</attributes>
<pd>doom3_private</pd> <pd>doom3_private</pd>
</game> </game>
<game> <game>
<base>Q3_SERVER</base> <base>Q3_SERVER</base>
<type>ETQW_SERVER</type> <type>ETQW_SERVER</type>
@ -836,15 +834,17 @@
<game> <game>
<base>Q3_SERVER</base> <base>Q3_SERVER</base>
<type>IOURT_SERVER</type> <type>IOURT_SERVER</type>
<name>ioUrbanTerror</name> <name>UrbanTerror</name>
<id>IOURTS</id> <id>IOURTS</id>
<qstat_str>IOURTS</qstat_str> <qstat_str>IOURTS</qstat_str>
<qstat_option>-iourts</qstat_option> <qstat_option>-iourts</qstat_option>
<qstat_master_option>-iourtm</qstat_master_option> <qstat_master_option>-iourtm</qstat_master_option>
<icon>iourt.xpm</icon> <icon>iourt.xpm</icon>
<config_is_valid>config_is_valid_generic</config_is_valid> <config_is_valid>config_is_valid_generic</config_is_valid>
<command>urbanterror</command>
<command>Quake3-UrT</command>
<command>ioUrbanTerror</command> <command>ioUrbanTerror</command>
<default_home>~/.ioUrbanTerror</default_home> <default_home>~/.q3a</default_home>
<cmd_or_dir_changed>tremulous_cmd_or_dir_changed</cmd_or_dir_changed> <cmd_or_dir_changed>tremulous_cmd_or_dir_changed</cmd_or_dir_changed>
<prefs_load>q3_prefs_load_common</prefs_load> <prefs_load>q3_prefs_load_common</prefs_load>
<update_prefs>tremulous_update_prefs</update_prefs> <update_prefs>tremulous_update_prefs</update_prefs>

33
src/source.c
View File

@ -1032,7 +1032,7 @@ void free_master (struct master *m) {
static char *builtin_masters_update_info[] = { static char *builtin_masters_update_info[] = {
"ADD QS http://www.gameaholic.com/servers/qspy-quake Gameaholic.Com", "ADD QS http://www.gameaholic.com/servers/qspy-quake gameaholic.com",
"DELETE QS http://ironman.planetquake.com/serversqspy.txt Ironman", // does no longer work "DELETE QS http://ironman.planetquake.com/serversqspy.txt Ironman", // does no longer work
"ADD QWS master://192.246.40.37:27000 id Limbo", "ADD QWS master://192.246.40.37:27000 id Limbo",
@ -1050,7 +1050,7 @@ static char *builtin_masters_update_info[] = {
"DELETE Q2S master://master.quake.inet.fi:27900 iNET (Finland)", // doesn't work (26.09.2004) "DELETE Q2S master://master.quake.inet.fi:27900 iNET (Finland)", // doesn't work (26.09.2004)
"DELETE Q2S master://q2master.mondial.net.au:27900 Australia", // doesn't work (26.09.2004) "DELETE Q2S master://q2master.mondial.net.au:27900 Australia", // doesn't work (26.09.2004)
"DELETE Q2S master://q2master.gxp.de:27900 gXp (Germany)", // doesn't work (26.09.2004) "DELETE Q2S master://q2master.gxp.de:27900 gXp (Germany)", // doesn't work (26.09.2004)
"ADD Q2S http://www.gameaholic.com/servers/qspy-quake2 Gameaholic.Com", "ADD Q2S http://www.gameaholic.com/servers/qspy-quake2 gameaholic.com",
"ADD Q2S http://www.lithium.com/quake2/gamespy.txt Lithium", "ADD Q2S http://www.lithium.com/quake2/gamespy.txt Lithium",
"ADD Q2S master://masterserver.exhale.de exhale.de", "ADD Q2S master://masterserver.exhale.de exhale.de",
"ADD Q2S master://netdome.biz netdome.biz", "ADD Q2S master://netdome.biz netdome.biz",
@ -1065,14 +1065,14 @@ static char *builtin_masters_update_info[] = {
// "ADD Q3S master://q3master.splatterworld.de Germany", // "ADD Q3S master://q3master.splatterworld.de Germany",
// "ADD Q3S master://q3.golsyd.net.au Australia", // "ADD Q3S master://q3.golsyd.net.au Australia",
"DELETE Q3S master://q3master.barrysworld.com:27950 BarrysWorld", // doesn't work (26.09.2004) "DELETE Q3S master://q3master.barrysworld.com:27950 BarrysWorld", // doesn't work (26.09.2004)
"ADD Q3S http://www.gameaholic.com/servers/qspy-quake3 Gameaholic.com", "ADD Q3S http://www.gameaholic.com/servers/qspy-quake3 gameaholic.com",
"ADD Q3S master://dpmaster.deathmask.net dpmaster.deathmask.net", "ADD Q3S master://dpmaster.deathmask.net dpmaster.deathmask.net",
"ADD Q4S master://q4master.idsoftware.com id", "ADD Q4S master://q4master.idsoftware.com id",
// "ADD HWS master://santa.quakeforge.net:26900 QuakeForge", // "ADD HWS master://santa.quakeforge.net:26900 QuakeForge",
"ADD SNS http://www.gameaholic.com/servers/qspy-sin Gameaholic.Com", "ADD SNS http://www.gameaholic.com/servers/qspy-sin gameaholic.com",
"ADD SNS http://asp.planetquake.com/sinserverlist/servers.txt PlanetQuake", "ADD SNS http://asp.planetquake.com/sinserverlist/servers.txt PlanetQuake",
"DELETE HLS master://half-life.east.won.net WON East", // switched off "DELETE HLS master://half-life.east.won.net WON East", // switched off
@ -1087,10 +1087,10 @@ static char *builtin_masters_update_info[] = {
"ADD A2S,-stma2s master://steam2.steampowered.com:27011 Steam 2", "ADD A2S,-stma2s master://steam2.steampowered.com:27011 Steam 2",
"ADD A2S,-stma2s master://69.28.151.178:27011 Valve 1", "ADD A2S,-stma2s 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.gameaholic.com/servers/qspy-kingpin gameaholic.com",
"ADD Q2S:KP http://www.ogn.org:6666 OGN", "ADD Q2S:KP http://www.ogn.org:6666 OGN",
"ADD Q2S:HR http://www.gameaholic.com/servers/qspy-heretic2 Gameaholic.Com", "ADD Q2S:HR http://www.gameaholic.com/servers/qspy-heretic2 gameaholic.com",
"DELETE UNS gmaster://unreal.epicgames.com:28900 Epic", // doesn't work (26.11.2004) "DELETE UNS gmaster://unreal.epicgames.com:28900 Epic", // doesn't work (26.11.2004)
"DELETE UNS gmaster://utmaster.barrysworld.com:28909 BarrysWorld", // doesn't work (26.09.2004) "DELETE UNS gmaster://utmaster.barrysworld.com:28909 BarrysWorld", // doesn't work (26.09.2004)
@ -1106,14 +1106,15 @@ static char *builtin_masters_update_info[] = {
"ADD T2S master://198.74.35.18:27999 Master 3", "ADD T2S master://198.74.35.18:27999 Master 3",
"DELETE WOS master://wolf.idsoftware.com:27950 id", // does no longer work "DELETE WOS master://wolf.idsoftware.com:27950 id", // does no longer work
"ADD WOS master://wolfmaster.idsoftware.com:27950 id", "ADD WOS master://wolfmaster.idsoftware.com:27950 wolfmaster.idsoftware.com",
"ADD WOETS master://etmaster.idsoftware.com:27950 id",
"ADD DM3S master://idnet.ua-corp.com:27650 id", "ADD WOETS master://etmaster.idsoftware.com:27950 etmaster.idsoftware.com",
"ADD DM3S master://idnet.ua-corp.com:27650 idnet.ua-corp.com:",
"ADD ETQWS http://etqw-ipgetter.demonware.net/ipgetter/ demonware", "ADD ETQWS http://etqw-ipgetter.demonware.net/ipgetter/ demonware",
"ADD EFS http://www.gameaholic.com/servers/qspy-startrekeliteforce Gameaholic.com", "ADD EFS http://www.gameaholic.com/servers/qspy-startrekeliteforce gameaholic.com",
"ADD EFS master://master.stef1.ravensoft.com:27953 Ravensoft", "ADD EFS master://master.stef1.ravensoft.com:27953 Ravensoft",
"DELETE D3P master://gt.pxo.net:3445 PXO", // doesn't work "DELETE D3P master://gt.pxo.net:3445 PXO", // doesn't work
@ -1177,19 +1178,19 @@ static char *builtin_masters_update_info[] = {
"ADD OTTDS master://master.openttd.org OpenTTD", "ADD OTTDS master://master.openttd.org OpenTTD",
"ADD Q3RALLYS master://master.q3rally.com master.q3rally.com", "ADD Q3RALLYS master://master.q3rally.com master.q3rally.com",
/* "DELETE Q3RALLYS master://master.ioquake3.org master.ioquake3.org", */ // not used anymore // "DELETE Q3RALLYS master://master.ioquake3.org master.ioquake3.org", // not used anymore
"DELETE Q3RALLYS master://master.q3alive.net master.q3alive.net", // switched off "DELETE Q3RALLYS master://master.q3alive.net master.q3alive.net", // switched off
"ADD IOURTS master://master.urbanterror.net ioUrbanTerror", "ADD IOURTS master://master.urbanterror.net master.urbanterror.net",
"ADD REACTIONS master://master.rq3.com master.rq3.com", "ADD REACTIONS master://master.rq3.com master.rq3.com",
/* "ADD REACTIONS master://master.ioquake3.org master.ioquake3.org", */ // not used anymore // "ADD REACTIONS master://master.ioquake3.org master.ioquake3.org", // not used anymore
"ADD SMOKINGUNSS master://master.smokin-guns.org master.smokin-guns.org", "ADD SMOKINGUNSS master://master.smokin-guns.org master.smokin-guns.org",
/* "DELETE SMOKINGUNSS master://master.ioquake3.org master.ioquake3.org", */ // not used nymore // "DELETE SMOKINGUNSS master://master.ioquake3.org master.ioquake3.org", // not used anymore
"ADD SMOKINGUNSS master://parttimegeeks.net:27950 parttimegeeks.net", "ADD SMOKINGUNSS master://parttimegeeks.net:27950 parttimegeeks.net",
/* "DELETE SMOKINGUNSS master://soulserv.net:27950 soulserv.net", */ // down // "DELETE SMOKINGUNSS master://soulserv.net:27950 soulserv.net", // switched off
"DELETE SMOKINGUNSS master://master.q3alive.net master.q3alive.net", // switched off // "DELETE SMOKINGUNSS master://master.q3alive.net master.q3alive.net", // switched off
"ADD ALIENARENAS master://master.corservers.com:27900 master.corservers.com", "ADD ALIENARENAS master://master.corservers.com:27900 master.corservers.com",
"ADD ALIENARENAS master://master2.corservers.com:27900 master2.corservers.com", "ADD ALIENARENAS master://master2.corservers.com:27900 master2.corservers.com",

2
src/xqf.h
View File

@ -45,7 +45,7 @@
#define Q1_DEFAULT_PORT 26000 /* Quake */ #define Q1_DEFAULT_PORT 26000 /* Quake */
#define QW_DEFAULT_PORT 27500 /* QuakeWorld */ #define QW_DEFAULT_PORT 27500 /* QuakeWorld */
#define Q2_DEFAULT_PORT 27910 /* Quake2 */ #define Q2_DEFAULT_PORT 27910 /* Quake2 */
#define Q3_DEFAULT_PORT 27960 /* Quake3: Arena */ #define Q3_DEFAULT_PORT 27960 /* Quake3 Arena */
#define WO_DEFAULT_PORT 27960 /* Wolfenstein */ #define WO_DEFAULT_PORT 27960 /* Wolfenstein */
#define EF_DEFAULT_PORT 27960 /* Voyager Elite Force */ #define EF_DEFAULT_PORT 27960 /* Voyager Elite Force */
#define H2_DEFAULT_PORT 26900 /* Hexen2 */ #define H2_DEFAULT_PORT 26900 /* Hexen2 */