From 2b2c967e85329f19e7ad857b63ff27895c7eb442 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 7 Feb 2025 19:32:37 +0300 Subject: [PATCH] engine: add ms3.mentality.rip master server --- engine/common/masterlist.c | 21 ++++++++++++++------- engine/common/netchan.h | 1 - 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/engine/common/masterlist.c b/engine/common/masterlist.c index d3b2bf22..905bf60d 100644 --- a/engine/common/masterlist.c +++ b/engine/common/masterlist.c @@ -419,14 +419,21 @@ void NET_InitMasters( void ) Cvar_RegisterVariable( &sv_verbose_heartbeats ); - // keep main master always there - NET_AddMaster( MASTERSERVER_ADR, false, false ); - NET_AddMaster( "mentality.rip:27011", false, false ); // testing server, might be offline - NET_AddMaster( "ms2.mentality.rip:27010", false, false ); // secondary master + { // IPv4-only + NET_AddMaster( "mentality.rip:27010", false, false ); + NET_AddMaster( "ms2.mentality.rip:27010", false, false ); + NET_AddMaster( "ms3.mentality.rip:27010", false, false ); + } - NET_AddMaster( "aaaa.mentality.rip:27010", false, true ); // IPv6-only - NET_AddMaster( "aaaa.mentality.rip:27011", false, true ); // IPv6-only, testing server, might be offline - NET_AddMaster( "aaaa.ms2.mentality.rip:27010", false, false ); // secondary IPv6-only master + { // IPv6-only + NET_AddMaster( "aaaa.mentality.rip:27010", false, true ); + NET_AddMaster( "aaaa.ms2.mentality.rip:27010", false, true ); + } + + { // testing servers, might be offline + NET_AddMaster( "mentality.rip:27011", false, false ); + NET_AddMaster( "aaaa.mentality.rip:27011", false, true ); + } NET_LoadMasters( ); } diff --git a/engine/common/netchan.h b/engine/common/netchan.h index b7f55e30..6c7bdf54 100644 --- a/engine/common/netchan.h +++ b/engine/common/netchan.h @@ -69,7 +69,6 @@ GNU General Public License for more details. // bytes will be stripped by the networking channel layer #define NET_MAX_MESSAGE PAD_NUMBER(( NET_MAX_PAYLOAD + HEADER_BYTES ), 16 ) -#define MASTERSERVER_ADR "mentality.rip:27010" #define MS_SCAN_REQUEST "1\xFF" "0.0.0.0:0\0" #define PORT_MASTER 27010