From b92571839ecec3d8a14502a88a923df273514f10 Mon Sep 17 00:00:00 2001 From: Lance Date: Sat, 9 Jul 2011 06:32:29 +0000 Subject: [PATCH] Updated the master servers the client server browser uses (Q1, Q2 & Q3), and also updated the master server list the server reports heartbeats to (Q1). git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3862 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/net_master.c | 24 +++++++++++++++++------- engine/server/sv_main.c | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/engine/client/net_master.c b/engine/client/net_master.c index 1085293fe..3d430f67f 100644 --- a/engine/client/net_master.c +++ b/engine/client/net_master.c @@ -1360,11 +1360,11 @@ void MasterInfo_Refresh(void) // if (q1servers) //qw master servers { Master_AddMasterHTTP("http://www.gameaholic.com/servers/qspy-quakeworld", MT_MASTERHTTPQW, "gameaholic's QW master"); - Master_AddMaster("192.246.40.37:27000", MT_MASTERQW, "id Limbo"); - Master_AddMaster("192.246.40.37:27002", MT_MASTERQW, "id CTF"); - Master_AddMaster("192.246.40.37:27003", MT_MASTERQW, "id TeamFortress"); - Master_AddMaster("192.246.40.37:27004", MT_MASTERQW, "id Miscilaneous"); - Master_AddMaster("192.246.40.37:27006", MT_MASTERQW, "id Deathmatch Only"); + Master_AddMaster("satan.idsoftware.com:27000", MT_MASTERQW, "id Limbo"); + Master_AddMaster("satan.idsoftware.com:27002", MT_MASTERQW, "id CTF"); + Master_AddMaster("satan.idsoftware.com:27003", MT_MASTERQW, "id TeamFortress"); + Master_AddMaster("satan.idsoftware.com:27004", MT_MASTERQW, "id Miscilaneous"); + Master_AddMaster("satan.idsoftware.com:27006", MT_MASTERQW, "id Deathmatch Only"); Master_AddMaster("150.254.66.120:27000", MT_MASTERQW, "Poland's master server."); Master_AddMaster("62.112.145.129:27000", MT_MASTERQW, "Ocrana master server."); @@ -1375,8 +1375,12 @@ void MasterInfo_Refresh(void) Master_AddMaster("195.74.0.8", MT_MASTERQW, "unknown2 master server."); Master_AddMaster("204.182.161.2", MT_MASTERQW, "unknown5 master server."); - Master_AddMaster("asgaard.morphos-team.net:27000",MT_MASTERQW, "Asgaard"); + Master_AddMaster("masterserver.exhale.de:27000",MT_MASTERQW, "team exhale"); + Master_AddMaster("qwmaster.fodquake.net:27000",MT_MASTERQW, "Fodquake.net"); Master_AddMaster("master.quakeservers.net:27000",MT_MASTERQW, "QuakeServers.net"); + Master_AddMaster("master.teamdamage.com:27000",MT_MASTERQW, "TeamDamage"); + Master_AddMaster("kubus.rulez.pl:27000",MT_MASTERQW, "Kubus"); + Master_AddMaster("telefrag.me:27000",MT_MASTERQW, "Telefrag.ME"); Master_AddMaster("255.255.255.255:27500", MT_BCASTQW, "Nearby QuakeWorld UDP servers."); } @@ -1399,13 +1403,19 @@ void MasterInfo_Refresh(void) #ifdef USEIPX Master_AddMaster("00000000:ffffffffffff:27910", MT_BCASTQ2, "Nearby Quake2 IPX servers."); #endif - Master_AddMaster("192.246.40.37:27900", MT_MASTERQ2, "id q2 Master."); + Master_AddMaster("satan.idsoftware.com:27900", MT_MASTERQ2, "id q2 Master."); + Master_AddMaster("netdome.biz:27900", MT_MASTERQ2, "Netdome.biz"); + Master_AddMaster("master.q2servers.com:27900", MT_MASTERQ2, "q2servers.com"); + Master_AddMaster("masterserver.exhale.de:27900",MT_MASTERQ2, "team exhale"); + Master_AddMaster("master.planetgloom.com:27900",MT_MASTERQ2, "Planetgloom.com"); } //q3 { Master_AddMaster("255.255.255.255:27960", MT_BCASTQ3, "Nearby Quake3 UDP servers."); Master_AddMaster("master.quake3arena.com:27950", MT_MASTERQ3, "Quake3 master server."); + Master_AddMaster("master3.quake3arena.com:27950", MT_MASTERQ3, "Quake3 master3 server."); + Master_AddMaster("masterserver.exhale.de:27950", MT_MASTERQ3, "team exhale"); } } diff --git a/engine/server/sv_main.c b/engine/server/sv_main.c index 59c25d824..207749ae7 100644 --- a/engine/server/sv_main.c +++ b/engine/server/sv_main.c @@ -77,7 +77,7 @@ sv_masterlist_t sv_masterlist[] = { {MP_QUAKEWORLD, CVARC("sv_qwmasterextra2", "masterserver.exhale.de:27000", SV_Masterlist_Callback)}, //german. admin unknown {MP_QUAKEWORLD, CVARC("sv_qwmasterextra3", "kubus.rulez.pl:27000", SV_Masterlist_Callback)}, //poland. admin unknown {MP_QUAKEWORLD, CVARC("sv_qwmasterextra4", "master.quakeservers.net:27000", SV_Masterlist_Callback)}, //european. admin: raz0? - //{MP_QUAKEWORLD, CVARC("sv_qwmasterextra5", "asgaard.morphos-team.net:27000", SV_Masterlist_Callback)}, //admin bigfoot + {MP_QUAKEWORLD, CVARC("sv_qwmasterextra5", "qwmaster.fodquake.net:27000", SV_Masterlist_Callback)}, {MP_DARKPLACES, CVARC("sv_masterextra1", "ghdigital.com:27950", SV_Masterlist_Callback)}, //69.59.212.88 (admin: LordHavoc) {MP_DARKPLACES, CVARC("sv_masterextra2", "dpmaster.deathmask.net:27950", SV_Masterlist_Callback)}, //209.164.24.243 (admin: Willis)