From eca0d47fb270b82cf05f06360686b20000e091e0 Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin <15944199+nekonomicon@users.noreply.github.com> Date: Wed, 29 Nov 2023 13:12:12 +0500 Subject: [PATCH] client: play mp3 sound under GoldSource too. --- cl_dll/hud_msg.cpp | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/cl_dll/hud_msg.cpp b/cl_dll/hud_msg.cpp index 04406549..1e4c9ae3 100644 --- a/cl_dll/hud_msg.cpp +++ b/cl_dll/hud_msg.cpp @@ -129,20 +129,45 @@ int CHud::MsgFunc_Concuss( const char *pszName, int iSize, void *pbuf ) int CHud::MsgFunc_PlayMP3( const char *pszName, int iSize, void *pbuf ) //AJH -Killar MP3 { + const char *pszSound; + char cmd[64]; + BEGIN_READ( pbuf, iSize ); //gMP3.PlayMP3( READ_STRING() ); - gEngfuncs.pfnPrimeMusicStream( READ_STRING(), 1 ); + pszSound = READ_STRING(); + + if( !IsXashFWGS( )) + { + sprintf( cmd, "mp3 loop %s\n", pszSound ); + gEngfuncs.pfnClientCmd( cmd ); + } + else + gEngfuncs.pfnPrimeMusicStream( pszSound, 1 ); + return 1; } int CHud::MsgFunc_PlayBGM( const char *pszName, int iSize, void *pbuf ) //AJH -Killar MP3 { + const char *pszSound; + char cmd[64]; + BEGIN_READ( pbuf, iSize ); if( CVAR_GET_FLOAT( "hud_bgm" ) > 0 ) + { //gMP3.PlayMP3( READ_STRING() ); - gEngfuncs.pfnPrimeMusicStream( READ_STRING(), 1 ); + pszSound = READ_STRING(); + + if( !IsXashFWGS( )) + { + sprintf( cmd, "mp3 loop %s\n", pszSound ); + gEngfuncs.pfnClientCmd( cmd ); + } + else + gEngfuncs.pfnPrimeMusicStream( pszSound, 1 ); + } return 1; } @@ -150,7 +175,11 @@ int CHud::MsgFunc_PlayBGM( const char *pszName, int iSize, void *pbuf ) //AJH -K int CHud::MsgFunc_StopMP3( const char *pszName, int iSize, void *pbuf ) //AJH -Killar MP3 { //gMP3.StopMP3(); - gEngfuncs.pfnPrimeMusicStream( 0, 0 ); + if( !IsXashFWGS( )) + gEngfuncs.pfnClientCmd( "mp3 stop\n" ); + else + gEngfuncs.pfnPrimeMusicStream( 0, 0 ); + return 1; }