From 626c5e44f6efeed17dedfa4dbbc0994a8fe25698 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Sat, 18 Jan 2025 09:44:21 +0300
Subject: [PATCH] engine: client: use existing engine functions for some client
 API functions

---
 engine/client/cl_demo.c |  2 +-
 engine/client/cl_efx.c  |  1 -
 engine/client/cl_game.c | 54 ++++-------------------------------------
 engine/client/client.h  |  2 +-
 4 files changed, 7 insertions(+), 52 deletions(-)

diff --git a/engine/client/cl_demo.c b/engine/client/cl_demo.c
index d0bd9e45..96de69a0 100644
--- a/engine/client/cl_demo.c
+++ b/engine/client/cl_demo.c
@@ -373,7 +373,7 @@ CL_WriteDemoUserMessage
 Dumps the user message (demoaction)
 ====================
 */
-void CL_WriteDemoUserMessage( const byte *buffer, size_t size )
+void GAME_EXPORT CL_WriteDemoUserMessage( int size, byte *buffer )
 {
 	if( !cls.demorecording || cls.demowaiting )
 		return;
diff --git a/engine/client/cl_efx.c b/engine/client/cl_efx.c
index a7522b7a..51ffde8c 100644
--- a/engine/client/cl_efx.c
+++ b/engine/client/cl_efx.c
@@ -2229,4 +2229,3 @@ void CL_ThinkParticle( double frametime, particle_t *p )
 		break;
 	}
 }
-
diff --git a/engine/client/cl_game.c b/engine/client/cl_game.c
index c08cb0c4..7973c375 100644
--- a/engine/client/cl_game.c
+++ b/engine/client/cl_game.c
@@ -3348,28 +3348,6 @@ DemoApi implementation
 
 =================
 */
-/*
-=================
-Demo_IsRecording
-
-=================
-*/
-static int GAME_EXPORT Demo_IsRecording( void )
-{
-	return cls.demorecording;
-}
-
-/*
-=================
-Demo_IsPlayingback
-
-=================
-*/
-static int GAME_EXPORT Demo_IsPlayingback( void )
-{
-	return cls.demoplayback;
-}
-
 /*
 =================
 Demo_IsTimeDemo
@@ -3381,17 +3359,6 @@ static int GAME_EXPORT Demo_IsTimeDemo( void )
 	return cls.timedemo;
 }
 
-/*
-=================
-Demo_WriteBuffer
-
-=================
-*/
-static void GAME_EXPORT Demo_WriteBuffer( int size, byte *buffer )
-{
-	CL_WriteDemoUserMessage( buffer, size );
-}
-
 /*
 =================
 NetworkApi implementation
@@ -3577,17 +3544,6 @@ static int GAME_EXPORT NetAPI_CompareAdr( netadr_t *a, netadr_t *b )
 	return NET_CompareAdr( *a, *b );
 }
 
-/*
-=================
-NetAPI_StringToAdr
-
-=================
-*/
-static int GAME_EXPORT NetAPI_StringToAdr( char *s, netadr_t *a )
-{
-	return NET_StringToAdr( s, a );
-}
-
 /*
 =================
 NetAPI_ValueForKey
@@ -3795,10 +3751,10 @@ static event_api_t gEventApi =
 
 static demo_api_t gDemoApi =
 {
-	Demo_IsRecording,
-	Demo_IsPlayingback,
+	(void *)CL_IsRecordDemo,
+	(void *)CL_IsPlaybackDemo,
 	Demo_IsTimeDemo,
-	Demo_WriteBuffer,
+	CL_WriteDemoUserMessage,
 };
 
 net_api_t gNetApi =
@@ -3810,8 +3766,8 @@ net_api_t gNetApi =
 	NetAPI_CancelAllRequests,
 	NetAPI_AdrToString,
 	NetAPI_CompareAdr,
-	NetAPI_StringToAdr,
-	NetAPI_ValueForKey,
+	(void *)NET_StringToAdr,
+	Info_ValueForKey,
 	NetAPI_RemoveKey,
 	NetAPI_SetValueForKey,
 };
diff --git a/engine/client/client.h b/engine/client/client.h
index 7e9b96e9..8b6d5c05 100644
--- a/engine/client/client.h
+++ b/engine/client/client.h
@@ -767,7 +767,7 @@ void CL_StartupDemoHeader( void );
 void CL_DrawDemoRecording( void );
 void CL_WriteDemoUserCmd( int cmdnumber );
 void CL_WriteDemoMessage( qboolean startup, int start, sizebuf_t *msg );
-void CL_WriteDemoUserMessage( const byte *buffer, size_t size );
+void CL_WriteDemoUserMessage( int size, byte *buffer );
 qboolean CL_DemoReadMessage( byte *buffer, size_t *length );
 void CL_DemoInterpolateAngles( void );
 void CL_CheckStartupDemos( void );