[SP] rit.Malloc -> rit.Z_Malloc

To match MP
SomaZ · Oct 3, 2023 · 6654638 · 6654638
1 parent a3ef151
commit 6654638
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
@@ -1053,11 +1053,6 @@ int get_com_frameTime( void )
 	return com_frameTime;
 }
 
-void *CL_Malloc(int iSize, memtag_t eTag, qboolean bZeroit, int iAlign)
-{
-    return Z_Malloc(iSize, eTag, bZeroit);
-}
-
 /*
 ============
 CL_InitRef
@@ -1151,7 +1146,7 @@ void CL_InitRef( void ) {
 	RIT(SV_Trace);
 	RIT(S_RestartMusic);
 	RIT(Z_Free);
-	rit.Malloc=CL_Malloc;
+	RIT(Z_Malloc);
 	RIT(Z_MemSize);
 	RIT(Z_MorphMallocTag);
 

diff --git a/code/rd-common/tr_public.h b/code/rd-common/tr_public.h
@@ -40,7 +40,7 @@ typedef struct {
 	int					(*Milliseconds)						( void );
 
 	void				(*Hunk_ClearToMark)					( void );
-	void*				(*Malloc)							( int iSize, memtag_t eTag, qboolean zeroIt, int iAlign );
+	void*				(*Z_Malloc)							( int iSize, memtag_t eTag, qboolean zeroIt, int iAlign );
 	int					(*Z_Free)							( void *memory );
 	int					(*Z_MemSize)						( memtag_t eTag );
 	void				(*Z_MorphMallocTag)					( void *pvBuffer, memtag_t eDesiredTag );

diff --git a/code/rd-vanilla/tr_subs.cpp b/code/rd-vanilla/tr_subs.cpp
@@ -79,7 +79,7 @@ void Com_DPrintf(const char *format, ...)
 // ZONE
 
 void *R_Malloc( int iSize, memtag_t eTag, qboolean bZeroit ) {
-	return ri.Malloc( iSize, eTag, bZeroit, 4 );
+	return ri.Z_Malloc( iSize, eTag, bZeroit, 4 );
 }
 
 void R_Free( void *ptr ) {
@@ -95,5 +95,5 @@ void R_MorphMallocTag( void *pvBuffer, memtag_t eDesiredTag ) {
 }
 
 void *R_Hunk_Alloc( int iSize, qboolean bZeroit ) {
-	return ri.Malloc( iSize, TAG_HUNKALLOC, bZeroit, 4 );
+	return ri.Z_Malloc( iSize, TAG_HUNKALLOC, bZeroit, 4 );
 }