vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: fixes for dedicated

Browse source
This commit is contained in:
Alibek Omarov 2020-08-23 19:01:50 +03:00
parent 9ff6d44178
commit d30605c09f
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/common/mod_studio.c
View file

@ -1065,7 +1065,9 @@ void Mod_LoadStudioModel( model_t *mod, const void *buffer, qboolean *loaded )
} }
else else
{ {
#if !XASH_DEDICATED
ref.dllFuncs.Mod_StudioLoadTextures( mod, thdr ); ref.dllFuncs.Mod_StudioLoadTextures( mod, thdr );
#endif
// give space for textures and skinrefs // give space for textures and skinrefs
size1 = thdr->numtextures * sizeof( mstudiotexture_t ); size1 = thdr->numtextures * sizeof( mstudiotexture_t );
@ -1092,7 +1094,9 @@ void Mod_LoadStudioModel( model_t *mod, const void *buffer, qboolean *loaded )
loadmodel->cache.data = Mem_Calloc( loadmodel->mempool, phdr->length ); loadmodel->cache.data = Mem_Calloc( loadmodel->mempool, phdr->length );
memcpy( loadmodel->cache.data, buffer, phdr->length ); memcpy( loadmodel->cache.data, buffer, phdr->length );
phdr = (studiohdr_t *)loadmodel->cache.data; // get the new pointer on studiohdr phdr = (studiohdr_t *)loadmodel->cache.data; // get the new pointer on studiohdr
#if !XASH_DEDICATED
ref.dllFuncs.Mod_StudioLoadTextures( mod, phdr ); ref.dllFuncs.Mod_StudioLoadTextures( mod, phdr );
#endif
// NOTE: we wan't keep raw textures in memory. just cutoff model pointer above texture base // NOTE: we wan't keep raw textures in memory. just cutoff model pointer above texture base
loadmodel->cache.data = Mem_Realloc( loadmodel->mempool, loadmodel->cache.data, phdr->texturedataindex ); loadmodel->cache.data = Mem_Realloc( loadmodel->mempool, loadmodel->cache.data, phdr->texturedataindex );

2
engine/common/pm_surface.c
View file

@ -73,6 +73,7 @@ int PM_SampleMiptex( const msurface_t *surf, const vec3_t point )
// TODO: this won't work under dedicated // TODO: this won't work under dedicated
// should we bring up imagelib and keep original buffers? // should we bring up imagelib and keep original buffers?
#if !XASH_DEDICATED
if( !Host_IsDedicated() ) if( !Host_IsDedicated() )
{ {
const byte *data; const byte *data;
@ -94,6 +95,7 @@ int PM_SampleMiptex( const msurface_t *surf, const vec3_t point )
return CONTENTS_EMPTY; return CONTENTS_EMPTY;
return CONTENTS_SOLID; return CONTENTS_SOLID;
} }
#endif // !XASH_DEDICATED
return contents; return contents;
} }

4
public/xash3d_mathlib.h
View file

@ -21,7 +21,11 @@ GNU General Public License for more details.
#include <tgmath.h> #include <tgmath.h>
#endif #endif
#include "build.h"
#ifdef XASH_MSVC
#pragma warning(disable : 4201) // nonstandard extension used #pragma warning(disable : 4201) // nonstandard extension used
#endif
// euler angle order // euler angle order
#define PITCH 0 #define PITCH 0