Merge branch 'ms-cvars-fix' into 'master'

Update server name insantly

See merge request STJr/SRB2!344
This commit is contained in:
Monster Iestyn 2018-11-25 14:04:12 -05:00
commit aaabf062b8

View file

@ -206,7 +206,7 @@ static void ServerName_OnChange(void);
#define DEF_PORT "28900" #define DEF_PORT "28900"
consvar_t cv_masterserver = {"masterserver", "ms.srb2.org:"DEF_PORT, CV_SAVE, NULL, MasterServer_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_masterserver = {"masterserver", "ms.srb2.org:"DEF_PORT, CV_SAVE, NULL, MasterServer_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_servername = {"servername", "SRB2 server", CV_SAVE, NULL, ServerName_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_servername = {"servername", "SRB2 server", CV_SAVE|CV_CALL|CV_NOINIT, NULL, ServerName_OnChange, 0, NULL, NULL, 0, 0, NULL};
INT16 ms_RoomId = -1; INT16 ms_RoomId = -1;
@ -978,8 +978,8 @@ void MasterClient_Ticker(void)
static void ServerName_OnChange(void) static void ServerName_OnChange(void)
{ {
UnregisterServer(); if (con_state == MSCS_REGISTERED)
RegisterServer(); AddToMasterServer(false);
} }
static void MasterServer_OnChange(void) static void MasterServer_OnChange(void)