Browse Source

engine: add NET_AdrToString to menu extended API, upgrade mainui submodule

pull/2/head
Alibek Omarov 3 years ago
parent
commit
df616b950d
  1. 3
      engine/client/cl_gameui.c
  2. 5
      engine/common/protocol.h
  3. 2
      engine/menu_int.h
  4. 2
      mainui

3
engine/client/cl_gameui.c

@ -1235,7 +1235,8 @@ static ui_extendedfuncs_t gExtendedfuncs =
Con_UtfMoveRight, Con_UtfMoveRight,
pfnGetRenderers, pfnGetRenderers,
Sys_DoubleTime, Sys_DoubleTime,
_COM_ParseFileSafe _COM_ParseFileSafe,
NET_AdrToString
}; };
void UI_UnloadProgs( void ) void UI_UnloadProgs( void )

5
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_ENTITY_BITS 12
#define MAX_LEGACY_WEAPON_BITS 5 #define MAX_LEGACY_WEAPON_BITS 5
#define MAX_LEGACY_MODEL_BITS 11 #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 #define MAX_LEGACY_TOTAL_CMDS 28 // magic number from old engine's sv_client.c
#endif//NET_PROTOCOL_H #endif//NET_PROTOCOL_H

2
engine/menu_int.h

@ -212,6 +212,8 @@ typedef struct ui_extendedfuncs_s {
double (*pfnDoubleTime)( void ); double (*pfnDoubleTime)( void );
char *(*pfnParseFile)( char *data, char *buf, const int size, unsigned int flags, int *len ); 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; } ui_extendedfuncs_t;
// deprecated export from old engine // deprecated export from old engine

2
mainui

@ -1 +1 @@
Subproject commit da881649a358981be75396b2403bd79580ce4706 Subproject commit f63a6081dd3c3e8d98cf3000e4070b0c1420d90a
Loading…
Cancel
Save