portability: fix PlayJA2SampleFromFile function

STR8 is a typedef for char * which MSVC is more than happy to pass a const char * to. this isn't valid C++ anywhere else
majcosta · Dec 15, 2024 · 132c69b · 132c69b
1 parent 37eb390
commit 132c69b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Utils/Sound Control.cpp b/Utils/Sound Control.cpp
@@ -496,7 +496,7 @@ UINT32 PlayWeaponSound(STR8 szFileName, UINT32 ubVolume, UINT32 uiPan)
 	return(SoundPlay((STR)szFileName, &spParms));
 }
 
-UINT32 PlayJA2SampleFromFile( STR8 szFileName, UINT32 usRate, UINT32 ubVolume, UINT32 ubLoops, UINT32 uiPan )
+UINT32 PlayJA2SampleFromFile( const char * szFileName, UINT32 usRate, UINT32 ubVolume, UINT32 ubLoops, UINT32 uiPan )
 {
 	//SoundLog((CHAR8 *)String(" Play sound %s on volume %d", szFileName, ubVolume));
 	// does the same thing as PlayJA2Sound, but one only has to pass the filename, not the index of the sound array

diff --git a/Utils/Sound Control.h b/Utils/Sound Control.h
@@ -416,7 +416,7 @@ BOOLEAN ShutdownJA2Sound( );
 UINT32 PlayJA2Sample( UINT32 usNum, UINT32 usRate, UINT32 ubVolume, UINT32 ubLoops, UINT32 uiPan );
 UINT32 PlayJA2StreamingSample( UINT32 usNum, UINT32 usRate, UINT32 ubVolume, UINT32 ubLoops, UINT32 uiPan );
 
-UINT32 PlayJA2SampleFromFile( STR8 szFileName, UINT32 usRate, UINT32 ubVolume, UINT32 ubLoops, UINT32 uiPan );
+UINT32 PlayJA2SampleFromFile( const char * szFileName, UINT32 usRate, UINT32 ubVolume, UINT32 ubLoops, UINT32 uiPan );
 UINT32 PlayWeaponSound(STR8 szFileName, UINT32 ubVolume, UINT32 uiPan);
 UINT32 PlayJA2StreamingSampleFromFile( STR8 szFileName, UINT32 usRate, UINT32 ubVolume, UINT32 ubLoops, UINT32 uiPan, SOUND_STOP_CALLBACK EndsCallback );