From d0ff201da23326a95f4d70bbc8eb8708da5ce7a7 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Thu, 14 Jun 2018 20:31:46 +0300
Subject: [PATCH] Fix dedicated compiling errors

---
 engine/{common => client}/mod_dbghulls.c | 0
 engine/common/dedicated.c                | 4 ++--
 engine/common/mod_bmodel.c               | 2 ++
 engine/common/mod_studio.c               | 2 +-
 engine/common/model.c                    | 5 ++++-
 engine/common/net_ws.c                   | 2 +-
 engine/common/system.c                   | 6 +++++-
 7 files changed, 15 insertions(+), 6 deletions(-)
 rename engine/{common => client}/mod_dbghulls.c (100%)

diff --git a/engine/common/mod_dbghulls.c b/engine/client/mod_dbghulls.c
similarity index 100%
rename from engine/common/mod_dbghulls.c
rename to engine/client/mod_dbghulls.c
diff --git a/engine/common/dedicated.c b/engine/common/dedicated.c
index 4ffe506d..66326411 100644
--- a/engine/common/dedicated.c
+++ b/engine/common/dedicated.c
@@ -351,7 +351,7 @@ void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded, ui
 	{
 		pinq1 = (dsprite_q1_t *)buffer;
 		size = sizeof( msprite_t ) + ( pinq1->numframes - 1 ) * sizeof( psprite->frames );
-		psprite = Mem_Alloc( mod->mempool, size );
+		psprite = Mem_Calloc( mod->mempool, size );
 		mod->cache.data = psprite;	// make link to extradata
 
 		psprite->type = pinq1->type;
@@ -371,7 +371,7 @@ void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded, ui
 	{
 		pinhl = (dsprite_hl_t *)buffer;
 		size = sizeof( msprite_t ) + ( pinhl->numframes - 1 ) * sizeof( psprite->frames );
-		psprite = Mem_Alloc( mod->mempool, size );
+		psprite = Mem_Calloc( mod->mempool, size );
 		mod->cache.data = psprite;	// make link to extradata
 
 		psprite->type = pinhl->type;
diff --git a/engine/common/mod_bmodel.c b/engine/common/mod_bmodel.c
index f647c153..5f78c5b1 100644
--- a/engine/common/mod_bmodel.c
+++ b/engine/common/mod_bmodel.c
@@ -2701,7 +2701,9 @@ qboolean Mod_LoadBmodelLumps( const byte *mod_base, qboolean isworld )
 	if( isworld )
 	{
 		loadmodel = mod;		// restore pointer to world
+#ifndef XASH_DEDICATED
 		Mod_InitDebugHulls();	// FIXME: build hulls for separate bmodels (shells, medkits etc)
+#endif // XASH_DEDICATED
 	}
 
 	for( i = 0; i < bmod->wadlist.count; i++ )
diff --git a/engine/common/mod_studio.c b/engine/common/mod_studio.c
index 1cc8a4cf..ccf011ed 100644
--- a/engine/common/mod_studio.c
+++ b/engine/common/mod_studio.c
@@ -1101,7 +1101,7 @@ void Mod_LoadStudioModel( model_t *mod, const void *buffer, qboolean *loaded )
 	}
 #else
 	// just copy model into memory
-	loadmodel->cache.data = Mem_Alloc( loadmodel->mempool, phdr->length );
+	loadmodel->cache.data = Mem_Calloc( loadmodel->mempool, phdr->length );
 	memcpy( loadmodel->cache.data, buffer, phdr->length );
 
 	phdr = loadmodel->cache.data;
diff --git a/engine/common/model.c b/engine/common/model.c
index 59cfe5a9..faab403d 100644
--- a/engine/common/model.c
+++ b/engine/common/model.c
@@ -164,7 +164,9 @@ void Mod_FreeAll( void )
 {
 	int	i;
 
+#ifndef XASH_DEDICATED
 	Mod_ReleaseHullPolygons();
+#endif
 	for( i = 0; i < mod_numknown; i++ )
 		Mod_FreeModel( &mod_known[i] );
 	mod_numknown = 0;
@@ -414,8 +416,9 @@ static void Mod_PurgeStudioCache( void )
 
 	// refresh hull data
 	SetBits( r_showhull->flags, FCVAR_CHANGED );
+#ifndef XASH_DEDICATED
 	Mod_ReleaseHullPolygons();
-
+#endif
 	// release previois map
 	Mod_FreeModel( mod_known );	// world is stuck on slot #0 always
 
diff --git a/engine/common/net_ws.c b/engine/common/net_ws.c
index 6d6eec87..a7b8e67c 100644
--- a/engine/common/net_ws.c
+++ b/engine/common/net_ws.c
@@ -436,7 +436,7 @@ int NET_GetHostByName( const char *hostname )
 	return ip;
 #else
 	struct hostent *h;
-	if(!( h = pGetHostByName( copy )))
+	if(!( h = pGetHostByName( hostname )))
 		return 0;
 	return *(int *)h->h_addr_list[0];
 #endif
diff --git a/engine/common/system.c b/engine/common/system.c
index 9c096dea..4ca7fa51 100644
--- a/engine/common/system.c
+++ b/engine/common/system.c
@@ -668,8 +668,10 @@ print into window console
 */
 void Sys_Print( const char *pMsg )
 {
+#ifndef XASH_DEDICATED
 	if( !Host_IsDedicated() )
 		Con_Print( pMsg );
+#endif
 
 #ifdef _WIN32
 	{
@@ -680,8 +682,10 @@ void Sys_Print( const char *pMsg )
 		char		*c = logbuf;
 		int		i = 0;
 
-		if( host.type == HOST_NORMAL )
+#ifndef XASH_DEDICATED
+		if( !Host_IsDedicated() )
 			Con_Print( pMsg );
+#endif
 
 		// if the message is REALLY long, use just the last portion of it
 		if( Q_strlen( pMsg ) > sizeof( buffer ) - 1 )