thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert z_zone.c -> z_zone.cpp

Browse source
This commit is contained in:
Eidolon 2024-10-18 18:56:14 -05:00
parent be377e523d
commit 5257b18ade
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -13,7 +13,7 @@ add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32
deh_soc.c deh_soc.c
deh_lua.c deh_lua.c
deh_tables.c deh_tables.c
z_zone.c z_zone.cpp
f_finale.c f_finale.c
f_wipe.cpp f_wipe.cpp
g_build_ticcmd.cpp g_build_ticcmd.cpp

12
src/z_zone.c → src/z_zone.cpp
View file

@ -8,7 +8,7 @@
// terms of the GNU General Public License, version 2. // terms of the GNU General Public License, version 2.
// See the 'LICENSE' file for more details. // See the 'LICENSE' file for more details.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/// \file z_zone.c /// \file z_zone.cpp
/// \brief Zone memory allocation. /// \brief Zone memory allocation.
/// This file does zone memory allocation. Each allocation is done with a /// This file does zone memory allocation. Each allocation is done with a
/// tag, and this file keeps track of all the allocations made. Later, you /// tag, and this file keeps track of all the allocations made. Later, you
@ -214,7 +214,7 @@ void *Z_Malloc2(size_t size, INT32 tag, void *user, INT32 alignbits,
CONS_Debug(DBG_MEMORY, "Z_Malloc %s:%d\n", file, line); CONS_Debug(DBG_MEMORY, "Z_Malloc %s:%d\n", file, line);
#endif #endif
block = xm(sizeof (memblock_t) + ALIGNPAD + size); block = (memblock_t*)xm(sizeof (memblock_t) + ALIGNPAD + size);
TracyCAlloc(block, sizeof (memblock_t) + ALIGNPAD + size); TracyCAlloc(block, sizeof (memblock_t) + ALIGNPAD + size);
ptr = MEMORY(block); ptr = MEMORY(block);
I_Assert((intptr_t)ptr % alignof (max_align_t) == 0); I_Assert((intptr_t)ptr % alignof (max_align_t) == 0);
@ -243,7 +243,7 @@ void *Z_Malloc2(size_t size, INT32 tag, void *user, INT32 alignbits,
if (user != NULL) if (user != NULL)
{ {
block->user = user; block->user = (void**)user;
*(void **)user = ptr; *(void **)user = ptr;
} }
else if (tag >= PU_PURGELEVEL) else if (tag >= PU_PURGELEVEL)
@ -555,7 +555,7 @@ void Z_SetUser(void *ptr, void **newuser)
I_Error("Internal memory management error: " I_Error("Internal memory management error: "
"tried to make block purgable but it has no owner"); "tried to make block purgable but it has no owner");
block->user = (void*)newuser; block->user = (void**)newuser;
*newuser = ptr; *newuser = ptr;
} }
@ -650,7 +650,7 @@ static void Command_Memdump_f(void)
for (block = head.next; block != &head; block = block->next) for (block = head.next; block != &head; block = block->next)
if (block->tag >= mintag && block->tag <= maxtag) if (block->tag >= mintag && block->tag <= maxtag)
{ {
char *filename = strrchr(block->ownerfile, PATHSEP[0]); const char *filename = strrchr(block->ownerfile, PATHSEP[0]);
CONS_Printf("[%3d] %s (%s) bytes @ %s:%d\n", block->tag, sizeu1(block->size), sizeu2(block->realsize), filename ? filename + 1 : block->ownerfile, block->ownerline); CONS_Printf("[%3d] %s (%s) bytes @ %s:%d\n", block->tag, sizeu1(block->size), sizeu2(block->realsize), filename ? filename + 1 : block->ownerfile, block->ownerline);
} }
} }
@ -662,5 +662,5 @@ static void Command_Memdump_f(void)
*/ */
char *Z_StrDup(const char *s) char *Z_StrDup(const char *s)
{ {
return strcpy(ZZ_Alloc(strlen(s) + 1), s); return strcpy((char*)ZZ_Alloc(strlen(s) + 1), s);
} }