From ef39f9c9cfa2a61cd6570ba68e8def4069089051 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Thu, 1 Nov 2018 23:31:16 +0300 Subject: [PATCH] engine: dedicated: fix build --- engine/common/con_utils.c | 4 ++-- engine/common/dedicated.c | 9 +++++++-- engine/common/host_state.c | 3 +++ engine/common/mod_bmodel.c | 2 ++ engine/common/system.c | 2 ++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/engine/common/con_utils.c b/engine/common/con_utils.c index e001039a..6e8927d6 100644 --- a/engine/common/con_utils.c +++ b/engine/common/con_utils.c @@ -1256,7 +1256,6 @@ void Host_WriteConfig( void ) NET_SaveMasters(); } -#endif /* =============== @@ -1325,7 +1324,7 @@ void Host_WriteOpenGLConfig( void ) FS_Printf( f, "\n" ); Cmd_WriteOpenGLVariables( f ); CFG_END( f, "opengl.cfg" ); - } + } else Con_DPrintf( S_ERROR "can't update opengl.cfg.\n" ); } @@ -1356,6 +1355,7 @@ void Host_WriteVideoConfig( void ) } else Con_DPrintf( S_ERROR "can't update video.cfg.\n" ); } +#endif // XASH_DEDICATED void Key_EnumCmds_f( void ) { diff --git a/engine/common/dedicated.c b/engine/common/dedicated.c index 5341a820..6e573ae2 100644 --- a/engine/common/dedicated.c +++ b/engine/common/dedicated.c @@ -304,9 +304,14 @@ void SCR_CheckStartupVids() } -imgfilter_t *R_FindTexFilter( const char *texname ) +void Sys_SetClipboardData( const byte *text, size_t size ) { - return NULL; + +} + +void CL_StopPlayback( void ) +{ + } #include "sprite.h" diff --git a/engine/common/host_state.c b/engine/common/host_state.c index 3d60ea09..d1b12c90 100644 --- a/engine/common/host_state.c +++ b/engine/common/host_state.c @@ -135,7 +135,10 @@ void Host_ShutdownGame( void ) void Host_RunFrame( float time ) { + // at this time, we don't need to get events from OS on dedicated +#ifndef XASH_DEDICATED Platform_RunEvents(); +#endif // XASH_DEDICATED // engine main frame Host_Frame( time ); diff --git a/engine/common/mod_bmodel.c b/engine/common/mod_bmodel.c index c077f264..203df701 100644 --- a/engine/common/mod_bmodel.c +++ b/engine/common/mod_bmodel.c @@ -1033,8 +1033,10 @@ static void Mod_CalcSurfaceExtents( msurface_t *surf ) info->lightextents[i] = surf->extents[i]; } +#ifndef XASH_DEDICATED if( !FBitSet( tex->flags, TEX_SPECIAL ) && ( surf->extents[i] > 16384 ) && ( tr.block_size == BLOCK_SIZE_DEFAULT )) Con_Reportf( S_ERROR "Bad surface extents %i\n", surf->extents[i] ); +#endif // XASH_DEDICATED } } diff --git a/engine/common/system.c b/engine/common/system.c index e997a446..53812312 100644 --- a/engine/common/system.c +++ b/engine/common/system.c @@ -148,6 +148,7 @@ BOOL WINAPI IsDebuggerPresent(void); #endif #endif +#ifndef XASH_DEDICATED /* ================ Sys_GetClipboardData @@ -177,6 +178,7 @@ void Sys_SetClipboardData( const byte *buffer, size_t size ) { Platform_SetClipboardText( (char *)buffer, size ); } +#endif // XASH_DEDICATED /* ================