From df616b950dbc7ff6f53b55231f9190310b7951f6 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Tue, 8 Mar 2022 07:00:20 +0300 Subject: [PATCH] engine: add NET_AdrToString to menu extended API, upgrade mainui submodule --- engine/client/cl_gameui.c | 3 ++- engine/common/protocol.h | 5 ----- engine/menu_int.h | 2 ++ mainui | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/engine/client/cl_gameui.c b/engine/client/cl_gameui.c index 427f96d1..6308e2e6 100644 --- a/engine/client/cl_gameui.c +++ b/engine/client/cl_gameui.c @@ -1235,7 +1235,8 @@ static ui_extendedfuncs_t gExtendedfuncs = Con_UtfMoveRight, pfnGetRenderers, Sys_DoubleTime, - _COM_ParseFileSafe + _COM_ParseFileSafe, + NET_AdrToString }; void UI_UnloadProgs( void ) diff --git a/engine/common/protocol.h b/engine/common/protocol.h index 8d1f83c5..7d00ba0b 100644 --- a/engine/common/protocol.h +++ b/engine/common/protocol.h @@ -299,11 +299,6 @@ extern const char *clc_strings[clc_lastmsg+1]; #define MAX_LEGACY_ENTITY_BITS 12 #define MAX_LEGACY_WEAPON_BITS 5 #define MAX_LEGACY_MODEL_BITS 11 -#if XASH_LOW_MEMORY >= 1 -#define MAX_LEGACY_SERVERS 32 -#else -#define MAX_LEGACY_SERVERS 256 -#endif #define MAX_LEGACY_TOTAL_CMDS 28 // magic number from old engine's sv_client.c #endif//NET_PROTOCOL_H diff --git a/engine/menu_int.h b/engine/menu_int.h index 85353c28..ee48ed48 100644 --- a/engine/menu_int.h +++ b/engine/menu_int.h @@ -212,6 +212,8 @@ typedef struct ui_extendedfuncs_s { double (*pfnDoubleTime)( void ); char *(*pfnParseFile)( char *data, char *buf, const int size, unsigned int flags, int *len ); + + const char *(*pfnAdrToString)( const struct netadr_s a ); } ui_extendedfuncs_t; // deprecated export from old engine diff --git a/mainui b/mainui index da881649..f63a6081 160000 --- a/mainui +++ b/mainui @@ -1 +1 @@ -Subproject commit da881649a358981be75396b2403bd79580ce4706 +Subproject commit f63a6081dd3c3e8d98cf3000e4070b0c1420d90a