YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-29 16:24:16 +00:00
Code Issues Projects Releases Wiki Activity

engine: common: zone: redefine poolhandle_t back to pointer for 32-bit systems

Browse Source
This commit is contained in:
Alibek Omarov 2022-12-19 18:38:49 +03:00 committed by GitHub
parent 6e179346c9
commit 327017421c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engine/common/zone.c
View File

@ -50,13 +50,16 @@ typedef struct mempool_s
struct mempool_s *next; // linked into global mempool list struct mempool_s *next; // linked into global mempool list
const char *filename; // file name and line where Mem_AllocPool was called const char *filename; // file name and line where Mem_AllocPool was called
int fileline; int fileline;
#if XASH_64BIT
poolhandle_t idx; poolhandle_t idx;
#endif
char name[64]; // name of the pool char name[64]; // name of the pool
uint sentinel2; // should always be MEMHEADER_SENTINEL1 uint sentinel2; // should always be MEMHEADER_SENTINEL1
} mempool_t; } mempool_t;
static mempool_t *poolchain = NULL; // critical stuff static mempool_t *poolchain = NULL; // critical stuff
#if XASH_64BIT
// a1ba: due to mempool being passed with the model through reused 32-bit field // a1ba: due to mempool being passed with the model through reused 32-bit field
// which makes engine incompatible with 64-bit pointers I changed mempool type // which makes engine incompatible with 64-bit pointers I changed mempool type
// from pointer to 32-bit handle, thankfully mempool structure is private // from pointer to 32-bit handle, thankfully mempool structure is private
@ -77,6 +80,12 @@ static mempool_t *Mem_FindPool( poolhandle_t poolptr )
return NULL; return NULL;
} }
#else
static mempool_t *Mem_FindPool( poolhandle_t poolptr )
{
return (mempool_t *)poolptr;
}
#endif
void *_Mem_Alloc( poolhandle_t poolptr, size_t size, qboolean clear, const char *filename, int fileline ) void *_Mem_Alloc( poolhandle_t poolptr, size_t size, qboolean clear, const char *filename, int fileline )
{ {
@ -219,10 +228,14 @@ poolhandle_t _Mem_AllocPool( const char *name, const char *filename, int filelin
pool->realsize = sizeof( mempool_t ); pool->realsize = sizeof( mempool_t );
Q_strncpy( pool->name, name, sizeof( pool->name )); Q_strncpy( pool->name, name, sizeof( pool->name ));
pool->next = poolchain; pool->next = poolchain;
pool->idx = ++lastidx;
poolchain = pool; poolchain = pool;
#if XASH_64BIT
pool->idx = ++lastidx;
return pool->idx; return pool->idx;
#else
return (poolhandle_t)pool;
#endif
} }
void _Mem_FreePool( poolhandle_t *poolptr, const char *filename, int fileline ) void _Mem_FreePool( poolhandle_t *poolptr, const char *filename, int fileline )