From e5b0473e4a562fc31b6b511fdbc08347c964dfbf Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 13 Apr 2018 20:08:50 +0300 Subject: [PATCH] Fix conflicting types on NXPrintf function family --- engine/common/common.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/engine/common/common.h b/engine/common/common.h index 6b7e5a9f..26f2e84d 100644 --- a/engine/common/common.h +++ b/engine/common/common.h @@ -153,6 +153,7 @@ typedef enum #include "com_strings.h" #include "crtlib.h" #include "cvar.h" +#include "con_nprint.h" #define XASH_VERSION 0.99f // engine current version @@ -977,9 +978,9 @@ wavdata_t *SCR_GetMovieInfo( void ); void SCR_Shutdown( void ); void Con_Print( const char *txt ); void Con_NPrintf( int idx, char *fmt, ... ); -void Con_NXPrintf( struct con_nprint_s *info, char *fmt, ... ); +void Con_NXPrintf( con_nprint_t *info, char *fmt, ... ); void UI_NPrintf( int idx, char *fmt, ... ); -void UI_NXPrintf( struct con_nprint_s *info, char *fmt, ... ); +void UI_NXPrintf( con_nprint_t *info, char *fmt, ... ); char *Info_ValueForKey( const char *s, const char *key ); void Info_RemovePrefixedKeys( char *start, char prefix ); qboolean Info_RemoveKey( char *s, const char *key );