mirror of
https://github.com/GTAmodding/re3.git
synced 2025-10-19 20:19:22 +00:00
Use bool8 in audio code
This commit is contained in:
Sergeanur
parent
596e12b897
commit
786e101acf
26 changed files with 1183 additions and 1183 deletions
|
|
@ -28,7 +28,7 @@ char SampleBankDataFilename[] = "AUDIO\\SFX.RAW";
|
|||
|
||||
FILE *fpSampleDescHandle;
|
||||
FILE *fpSampleDataHandle;
|
||||
bool bSampleBankLoaded [MAX_SFX_BANKS];
|
||||
bool8 bSampleBankLoaded [MAX_SFX_BANKS];
|
||||
int32 nSampleBankDiscStartOffset [MAX_SFX_BANKS];
|
||||
int32 nSampleBankSize [MAX_SFX_BANKS];
|
||||
int32 nSampleBankMemoryStartAddress[MAX_SFX_BANKS];
|
||||
|
|
@ -62,16 +62,16 @@ int8 nStreamPan [MAX_STREAMS];
|
|||
int8 nStreamVolume[MAX_STREAMS];
|
||||
uint32 _CurMP3Index;
|
||||
int32 _CurMP3Pos;
|
||||
bool _bIsMp3Active;
|
||||
bool8 _bIsMp3Active;
|
||||
|
||||
#if GTA_VERSION >= GTA3_PC_11 || defined(NO_CDCHECK)
|
||||
bool _bUseHDDAudio;
|
||||
bool8 _bUseHDDAudio;
|
||||
char _aHDDPath[MAX_PATH];
|
||||
#endif
|
||||
///////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
bool _bSampmanInitialised = false;
|
||||
bool8 _bSampmanInitialised = FALSE;
|
||||
|
||||
//
|
||||
// Miscellaneous globals / defines
|
||||
|
|
@ -98,7 +98,7 @@ S32 speaker_type=0;
|
|||
|
||||
U32 _maxSamples;
|
||||
float _fPrevEaxRatioDestination;
|
||||
bool _usingMilesFast2D;
|
||||
bool8 _usingMilesFast2D;
|
||||
float _fEffectsLevel;
|
||||
|
||||
|
||||
|
|
@ -170,17 +170,17 @@ release_existing()
|
|||
}
|
||||
|
||||
_fPrevEaxRatioDestination = 0.0f;
|
||||
_usingMilesFast2D = false;
|
||||
_usingMilesFast2D = FALSE;
|
||||
_fEffectsLevel = 0.0f;
|
||||
}
|
||||
|
||||
static bool
|
||||
static bool8
|
||||
set_new_provider(S32 index)
|
||||
{
|
||||
DWORD result;
|
||||
|
||||
if ( curprovider == index )
|
||||
return true;
|
||||
return TRUE;
|
||||
|
||||
//close the already opened provider
|
||||
curprovider = index;
|
||||
|
|
@ -207,7 +207,7 @@ set_new_provider(S32 index)
|
|||
|
||||
release_existing();
|
||||
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -238,7 +238,7 @@ set_new_provider(S32 index)
|
|||
AIL_set_3D_room_type(opened_provider, ENVIRONMENT_CAVE);
|
||||
|
||||
if ( !strcmp(providers[index].name, "Miles Fast 2D Positional Audio") )
|
||||
_usingMilesFast2D = true;
|
||||
_usingMilesFast2D = TRUE;
|
||||
}
|
||||
|
||||
AIL_3D_provider_attribute(opened_provider, "Maximum supported samples", &_maxSamples);
|
||||
|
|
@ -256,11 +256,11 @@ set_new_provider(S32 index)
|
|||
AIL_set_3D_sample_effects_level(opened_samples[i], 0.0f);
|
||||
}
|
||||
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
cSampleManager::cSampleManager(void) :
|
||||
|
|
@ -353,7 +353,7 @@ cSampleManager::SetCurrent3DProvider(uint8 nProvider)
|
|||
return curprovider;
|
||||
}
|
||||
|
||||
static bool
|
||||
static bool8
|
||||
_ResolveLink(char const *path, char *out)
|
||||
{
|
||||
IShellLink* psl;
|
||||
|
|
@ -389,7 +389,7 @@ _ResolveLink(char const *path, char *out)
|
|||
ppf->Release();
|
||||
psl->Release();
|
||||
#endif
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -399,15 +399,15 @@ _ResolveLink(char const *path, char *out)
|
|||
psl->Release();
|
||||
}
|
||||
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
_FindMP3s(void)
|
||||
{
|
||||
tMP3Entry *pList;
|
||||
bool bShortcut;
|
||||
bool bInitFirstEntry;
|
||||
bool8 bShortcut;
|
||||
bool8 bInitFirstEntry;
|
||||
HANDLE hFind;
|
||||
char path[MAX_PATH];
|
||||
char filepath[MAX_PATH*2];
|
||||
|
|
@ -474,10 +474,10 @@ _FindMP3s(void)
|
|||
if ( f ) fprintf(f, " - couldn't resolve shortcut");
|
||||
}
|
||||
|
||||
bShortcut = true;
|
||||
bShortcut = TRUE;
|
||||
}
|
||||
else
|
||||
bShortcut = false;
|
||||
bShortcut = FALSE;
|
||||
}
|
||||
|
||||
mp3Stream[0] = AIL_open_stream(DIG, filepath, 0);
|
||||
|
|
@ -524,7 +524,7 @@ _FindMP3s(void)
|
|||
|
||||
if ( f ) fprintf(f, " - OK\n");
|
||||
|
||||
bInitFirstEntry = false;
|
||||
bInitFirstEntry = FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -534,10 +534,10 @@ _FindMP3s(void)
|
|||
|
||||
if ( f ) fprintf(f, " - not an MP3 or supported MP3 type\n");
|
||||
|
||||
bInitFirstEntry = true;
|
||||
bInitFirstEntry = TRUE;
|
||||
}
|
||||
|
||||
while ( true )
|
||||
while ( TRUE )
|
||||
{
|
||||
if ( !FindNextFile(hFind, &fd) )
|
||||
break;
|
||||
|
|
@ -569,11 +569,11 @@ _FindMP3s(void)
|
|||
if ( f ) fprintf(f, " - couldn't resolve shortcut");
|
||||
}
|
||||
|
||||
bShortcut = true;
|
||||
bShortcut = TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
bShortcut = false;
|
||||
bShortcut = FALSE;
|
||||
|
||||
if ( filepathlen > MAX_PATH )
|
||||
{
|
||||
|
|
@ -620,7 +620,7 @@ _FindMP3s(void)
|
|||
|
||||
if ( f ) fprintf(f, " - OK\n");
|
||||
|
||||
bInitFirstEntry = false;
|
||||
bInitFirstEntry = FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -658,11 +658,11 @@ _FindMP3s(void)
|
|||
if ( f ) fprintf(f, " - couldn't resolve shortcut");
|
||||
}
|
||||
|
||||
bShortcut = true;
|
||||
bShortcut = TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
bShortcut = false;
|
||||
bShortcut = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -784,7 +784,7 @@ _GetMP3EntryByIndex(uint32 idx)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static inline bool
|
||||
static inline bool8
|
||||
_GetMP3PosFromStreamPos(uint32 *pPosition, tMP3Entry **pEntry)
|
||||
{
|
||||
_CurMP3Index = 0;
|
||||
|
|
@ -797,7 +797,7 @@ _GetMP3PosFromStreamPos(uint32 *pPosition, tMP3Entry **pEntry)
|
|||
*pPosition -= (*pEntry)->nTrackStreamPos;
|
||||
_CurMP3Pos = *pPosition;
|
||||
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
_CurMP3Index++;
|
||||
|
|
@ -808,10 +808,10 @@ _GetMP3PosFromStreamPos(uint32 *pPosition, tMP3Entry **pEntry)
|
|||
_CurMP3Pos = 0;
|
||||
_CurMP3Index = 0;
|
||||
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
bool
|
||||
bool8
|
||||
cSampleManager::IsMP3RadioChannelAvailable(void)
|
||||
{
|
||||
return nNumMP3s != 0;
|
||||
|
|
@ -840,13 +840,13 @@ cSampleManager::ReacquireDigitalHandle(void)
|
|||
}
|
||||
}
|
||||
|
||||
bool
|
||||
bool8
|
||||
cSampleManager::Initialise(void)
|
||||
{
|
||||
TRACE("start");
|
||||
|
||||
if ( _bSampmanInitialised )
|
||||
return true;
|
||||
return TRUE;
|
||||
|
||||
{
|
||||
for ( int32 i = 0; i < TOTAL_AUDIO_SAMPLES; i++ )
|
||||
|
|
@ -872,7 +872,7 @@ cSampleManager::Initialise(void)
|
|||
curprovider = -1;
|
||||
prevprovider = -1;
|
||||
|
||||
_usingMilesFast2D = false;
|
||||
_usingMilesFast2D = FALSE;
|
||||
usingEAX=0;
|
||||
usingEAX3=0;
|
||||
|
||||
|
|
@ -897,7 +897,7 @@ cSampleManager::Initialise(void)
|
|||
|
||||
for ( int32 i = 0; i < MAX_SFX_BANKS; i++ )
|
||||
{
|
||||
bSampleBankLoaded[i] = false;
|
||||
bSampleBankLoaded[i] = FALSE;
|
||||
nSampleBankDiscStartOffset[i] = 0;
|
||||
nSampleBankSize[i] = 0;
|
||||
nSampleBankMemoryStartAddress[i] = 0;
|
||||
|
|
@ -936,7 +936,7 @@ cSampleManager::Initialise(void)
|
|||
{
|
||||
OutputDebugString(AIL_last_error());
|
||||
Terminate();
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
add_providers();
|
||||
|
|
@ -944,14 +944,14 @@ cSampleManager::Initialise(void)
|
|||
if ( !InitialiseSampleBanks() )
|
||||
{
|
||||
Terminate();
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
nSampleBankMemoryStartAddress[SFX_BANK_0] = (int32)AIL_mem_alloc_lock(nSampleBankSize[SFX_BANK_0]);
|
||||
if ( !nSampleBankMemoryStartAddress[SFX_BANK_0] )
|
||||
{
|
||||
Terminate();
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] = (int32)AIL_mem_alloc_lock(PED_BLOCKSIZE*MAX_PEDSFX);
|
||||
|
|
@ -964,7 +964,7 @@ cSampleManager::Initialise(void)
|
|||
if (cacheFile) {
|
||||
fread(nStreamLength, sizeof(uint32), TOTAL_STREAMED_SOUNDS, cacheFile);
|
||||
fclose(cacheFile);
|
||||
m_bInitialised = true;
|
||||
m_bInitialised = TRUE;
|
||||
}else {
|
||||
#endif
|
||||
TRACE("cdrom");
|
||||
|
|
@ -973,9 +973,9 @@ cSampleManager::Initialise(void)
|
|||
char filepath[MAX_PATH];
|
||||
|
||||
{
|
||||
m_bInitialised = false;
|
||||
m_bInitialised = FALSE;
|
||||
|
||||
while (true)
|
||||
while (TRUE)
|
||||
{
|
||||
int32 drive = 'C';
|
||||
|
||||
|
|
@ -1000,7 +1000,7 @@ cSampleManager::Initialise(void)
|
|||
{
|
||||
fclose(f);
|
||||
|
||||
bool bFileNotFound = false;
|
||||
bool8 bFileNotFound = FALSE;
|
||||
|
||||
for ( int32 i = 0; i < TOTAL_STREAMED_SOUNDS; i++ )
|
||||
{
|
||||
|
|
@ -1020,19 +1020,19 @@ cSampleManager::Initialise(void)
|
|||
}
|
||||
else
|
||||
{
|
||||
bFileNotFound = true;
|
||||
bFileNotFound = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ( !bFileNotFound )
|
||||
{
|
||||
m_bInitialised = true;
|
||||
m_bInitialised = TRUE;
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_bInitialised = false;
|
||||
m_bInitialised = FALSE;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
|
@ -1047,11 +1047,11 @@ cSampleManager::Initialise(void)
|
|||
if ( FrontEndMenuManager.m_bQuitGameNoCD )
|
||||
{
|
||||
Terminate();
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
continue;
|
||||
#else
|
||||
m_bInitialised = true;
|
||||
m_bInitialised = TRUE;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -1071,7 +1071,7 @@ cSampleManager::Initialise(void)
|
|||
{
|
||||
int32 streamLength[TOTAL_STREAMED_SOUNDS];
|
||||
|
||||
bool bFileNotFound = false;
|
||||
bool8 bFileNotFound = FALSE;
|
||||
char rootpath[MAX_PATH];
|
||||
|
||||
strcpy(_aHDDPath, m_szCDRomRootPath);
|
||||
|
|
@ -1101,14 +1101,14 @@ cSampleManager::Initialise(void)
|
|||
}
|
||||
else
|
||||
{
|
||||
bFileNotFound = true;
|
||||
bFileNotFound = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
bFileNotFound = true;
|
||||
bFileNotFound = TRUE;
|
||||
|
||||
if ( !bFileNotFound )
|
||||
{
|
||||
|
|
@ -1117,10 +1117,10 @@ cSampleManager::Initialise(void)
|
|||
for ( int32 i = 0; i < TOTAL_STREAMED_SOUNDS; i++ )
|
||||
nStreamLength[i] = streamLength[i];
|
||||
|
||||
_bUseHDDAudio = true;
|
||||
_bUseHDDAudio = TRUE;
|
||||
}
|
||||
else
|
||||
_bUseHDDAudio = false;
|
||||
_bUseHDDAudio = FALSE;
|
||||
}
|
||||
#endif
|
||||
#ifdef AUDIO_CACHE
|
||||
|
|
@ -1152,7 +1152,7 @@ cSampleManager::Initialise(void)
|
|||
|
||||
TRACE("providerset");
|
||||
{
|
||||
_bSampmanInitialised = true;
|
||||
_bSampmanInitialised = TRUE;
|
||||
|
||||
U32 n = 0;
|
||||
|
||||
|
|
@ -1169,7 +1169,7 @@ cSampleManager::Initialise(void)
|
|||
if ( n == m_nNumberOfProviders )
|
||||
{
|
||||
Terminate();
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1198,13 +1198,13 @@ cSampleManager::Initialise(void)
|
|||
|
||||
time_t t = time(NULL);
|
||||
tm *localtm;
|
||||
bool bUseRandomTable;
|
||||
bool8 bUseRandomTable;
|
||||
|
||||
if ( t == -1 )
|
||||
bUseRandomTable = true;
|
||||
bUseRandomTable = TRUE;
|
||||
else
|
||||
{
|
||||
bUseRandomTable = false;
|
||||
bUseRandomTable = FALSE;
|
||||
localtm = localtime(&t);
|
||||
}
|
||||
|
||||
|
|
@ -1236,12 +1236,12 @@ cSampleManager::Initialise(void)
|
|||
else
|
||||
_CurMP3Pos = 0;
|
||||
|
||||
_bIsMp3Active = false;
|
||||
_bIsMp3Active = FALSE;
|
||||
}
|
||||
|
||||
TRACE("end");
|
||||
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -1290,10 +1290,10 @@ cSampleManager::Terminate(void)
|
|||
|
||||
AIL_shutdown();
|
||||
|
||||
_bSampmanInitialised = false;
|
||||
_bSampmanInitialised = FALSE;
|
||||
}
|
||||
|
||||
bool
|
||||
bool8
|
||||
cSampleManager::CheckForAnAudioFileOnCD(void)
|
||||
{
|
||||
#if GTA_VERSION < GTA3_PC_STEAM && !defined(NO_CDCHECK)
|
||||
|
|
@ -1316,13 +1316,13 @@ cSampleManager::CheckForAnAudioFileOnCD(void)
|
|||
{
|
||||
fclose(f);
|
||||
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
#else
|
||||
return true;
|
||||
return TRUE;
|
||||
#endif // #if GTA_VERSION < GTA3_PC_STEAM && !defined(NO_CDCHECK)
|
||||
}
|
||||
|
||||
|
|
@ -1415,48 +1415,48 @@ cSampleManager::SetMusicFadeVolume(uint8 nVolume)
|
|||
}
|
||||
|
||||
void
|
||||
cSampleManager::SetMonoMode(uint8 nMode)
|
||||
cSampleManager::SetMonoMode(bool8 nMode)
|
||||
{
|
||||
m_nMonoMode = nMode;
|
||||
}
|
||||
|
||||
bool
|
||||
bool8
|
||||
cSampleManager::LoadSampleBank(uint8 nBank)
|
||||
{
|
||||
if ( CTimer::GetIsCodePaused() )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
if ( MusicManager.IsInitialised()
|
||||
&& MusicManager.GetMusicMode() == MUSICMODE_CUTSCENE
|
||||
&& nBank != SFX_BANK_0 )
|
||||
{
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if ( fseek(fpSampleDataHandle, nSampleBankDiscStartOffset[nBank], SEEK_SET) != 0 )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
if ( fread((void *)nSampleBankMemoryStartAddress[nBank], 1, nSampleBankSize[nBank],fpSampleDataHandle) != nSampleBankSize[nBank] )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
bSampleBankLoaded[nBank] = true;
|
||||
bSampleBankLoaded[nBank] = TRUE;
|
||||
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
cSampleManager::UnloadSampleBank(uint8 nBank)
|
||||
{
|
||||
bSampleBankLoaded[nBank] = false;
|
||||
bSampleBankLoaded[nBank] = FALSE;
|
||||
}
|
||||
|
||||
bool
|
||||
bool8
|
||||
cSampleManager::IsSampleBankLoaded(uint8 nBank)
|
||||
{
|
||||
return bSampleBankLoaded[nBank];
|
||||
}
|
||||
|
||||
bool
|
||||
bool8
|
||||
cSampleManager::IsPedCommentLoaded(uint32 nComment)
|
||||
{
|
||||
int8 slot;
|
||||
|
|
@ -1469,10 +1469,10 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
|
|||
slot += ARRAY_SIZE(nPedSlotSfx);
|
||||
#endif
|
||||
if ( nComment == nPedSlotSfx[slot] )
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
int32
|
||||
|
|
@ -1494,11 +1494,11 @@ cSampleManager::_GetPedCommentSlot(uint32 nComment)
|
|||
return -1;
|
||||
}
|
||||
|
||||
bool
|
||||
bool8
|
||||
cSampleManager::LoadPedComment(uint32 nComment)
|
||||
{
|
||||
if ( CTimer::GetIsCodePaused() )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
// no talking peds during cutsenes or the game end
|
||||
if ( MusicManager.IsInitialised() )
|
||||
|
|
@ -1507,7 +1507,7 @@ cSampleManager::LoadPedComment(uint32 nComment)
|
|||
{
|
||||
case MUSICMODE_CUTSCENE:
|
||||
{
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
@ -1515,7 +1515,7 @@ cSampleManager::LoadPedComment(uint32 nComment)
|
|||
case MUSICMODE_FRONTEND:
|
||||
{
|
||||
if ( MusicManager.GetNextTrack() == STREAMED_SOUND_GAME_COMPLETED )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
@ -1523,10 +1523,10 @@ cSampleManager::LoadPedComment(uint32 nComment)
|
|||
}
|
||||
|
||||
if ( fseek(fpSampleDataHandle, m_aSamples[nComment].nOffset, SEEK_SET) != 0 )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
if ( fread((void *)(nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] + PED_BLOCKSIZE*nCurrentPedSlot), 1, m_aSamples[nComment].nSize, fpSampleDataHandle) != m_aSamples[nComment].nSize )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
nPedSlotSfxAddr[nCurrentPedSlot] = nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] + PED_BLOCKSIZE*nCurrentPedSlot;
|
||||
nPedSlotSfx [nCurrentPedSlot] = nComment;
|
||||
|
|
@ -1534,7 +1534,7 @@ cSampleManager::LoadPedComment(uint32 nComment)
|
|||
if ( ++nCurrentPedSlot >= MAX_PEDSFX )
|
||||
nCurrentPedSlot = 0;
|
||||
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
int32
|
||||
|
|
@ -1573,14 +1573,14 @@ cSampleManager::GetSampleLength(uint32 nSample)
|
|||
return m_aSamples[nSample].nSize >> 1;
|
||||
}
|
||||
|
||||
bool
|
||||
bool8
|
||||
cSampleManager::UpdateReverb(void)
|
||||
{
|
||||
if ( !usingEAX )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
if ( AudioManager.GetFrameCounter() & 15 )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
float y = AudioManager.GetReflectionsDistance(REFLECTION_TOP) + AudioManager.GetReflectionsDistance(REFLECTION_BOTTOM);
|
||||
float x = AudioManager.GetReflectionsDistance(REFLECTION_LEFT) + AudioManager.GetReflectionsDistance(REFLECTION_RIGHT);
|
||||
|
|
@ -1627,7 +1627,7 @@ cSampleManager::UpdateReverb(void)
|
|||
fRatio = clamp(fRatio, usingEAX3==1 ? 0.0f : 0.30f, 1.0f);
|
||||
|
||||
if ( fRatio == _fPrevEaxRatioDestination )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
if ( usingEAX3 )
|
||||
{
|
||||
|
|
@ -1647,26 +1647,26 @@ cSampleManager::UpdateReverb(void)
|
|||
|
||||
_fPrevEaxRatioDestination = fRatio;
|
||||
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
cSampleManager::SetChannelReverbFlag(uint32 nChannel, uint8 nReverbFlag)
|
||||
cSampleManager::SetChannelReverbFlag(uint32 nChannel, bool8 nReverbFlag)
|
||||
{
|
||||
bool b2d = false;
|
||||
bool8 b2d = FALSE;
|
||||
|
||||
switch ( nChannel )
|
||||
{
|
||||
case CHANNEL2D:
|
||||
{
|
||||
b2d = true;
|
||||
b2d = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ( usingEAX )
|
||||
{
|
||||
if ( nReverbFlag != 0 )
|
||||
if ( nReverbFlag != FALSE )
|
||||
{
|
||||
if ( !b2d )
|
||||
AIL_set_3D_sample_effects_level(opened_samples[nChannel], _fEffectsLevel);
|
||||
|
|
@ -1679,16 +1679,16 @@ cSampleManager::SetChannelReverbFlag(uint32 nChannel, uint8 nReverbFlag)
|
|||
}
|
||||
}
|
||||
|
||||
bool
|
||||
bool8
|
||||
cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
|
||||
{
|
||||
bool b2d = false;
|
||||
bool8 b2d = FALSE;
|
||||
|
||||
switch ( nChannel )
|
||||
{
|
||||
case CHANNEL2D:
|
||||
{
|
||||
b2d = true;
|
||||
b2d = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1698,14 +1698,14 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
|
|||
if ( nSfx < SAMPLEBANK_MAX )
|
||||
{
|
||||
if ( !IsSampleBankLoaded(nBank) )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
addr = nSampleBankMemoryStartAddress[nBank] + m_aSamples[nSfx].nOffset - m_aSamples[BankStartOffset[nBank]].nOffset;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( !IsPedCommentLoaded(nSfx) )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
int32 slot = _GetPedCommentSlot(nSfx);
|
||||
|
||||
|
|
@ -1717,10 +1717,10 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
|
|||
if ( opened_2dsamples[nChannel - MAXCHANNELS] )
|
||||
{
|
||||
AIL_set_sample_address(opened_2dsamples[nChannel - MAXCHANNELS], (void *)addr, m_aSamples[nSfx].nSize);
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
else
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1736,10 +1736,10 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
|
|||
if ( AIL_set_3D_sample_info(opened_samples[nChannel], &info) == 0 )
|
||||
{
|
||||
OutputDebugString(AIL_last_error());
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1831,13 +1831,13 @@ cSampleManager::SetChannelPan(uint32 nChannel, uint32 nPan)
|
|||
void
|
||||
cSampleManager::SetChannelFrequency(uint32 nChannel, uint32 nFreq)
|
||||
{
|
||||
bool b2d = false;
|
||||
bool8 b2d = FALSE;
|
||||
|
||||
switch ( nChannel )
|
||||
{
|
||||
case CHANNEL2D:
|
||||
{
|
||||
b2d = true;
|
||||
b2d = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1857,13 +1857,13 @@ cSampleManager::SetChannelFrequency(uint32 nChannel, uint32 nFreq)
|
|||
void
|
||||
cSampleManager::SetChannelLoopPoints(uint32 nChannel, uint32 nLoopStart, int32 nLoopEnd)
|
||||
{
|
||||
bool b2d = false;
|
||||
bool8 b2d = FALSE;
|
||||
|
||||
switch ( nChannel )
|
||||
{
|
||||
case CHANNEL2D:
|
||||
{
|
||||
b2d = true;
|
||||
b2d = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1883,13 +1883,13 @@ cSampleManager::SetChannelLoopPoints(uint32 nChannel, uint32 nLoopStart, int32 n
|
|||
void
|
||||
cSampleManager::SetChannelLoopCount(uint32 nChannel, uint32 nLoopCount)
|
||||
{
|
||||
bool b2d = false;
|
||||
bool8 b2d = FALSE;
|
||||
|
||||
switch ( nChannel )
|
||||
{
|
||||
case CHANNEL2D:
|
||||
{
|
||||
b2d = true;
|
||||
b2d = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1906,16 +1906,16 @@ cSampleManager::SetChannelLoopCount(uint32 nChannel, uint32 nLoopCount)
|
|||
}
|
||||
}
|
||||
|
||||
bool
|
||||
bool8
|
||||
cSampleManager::GetChannelUsedFlag(uint32 nChannel)
|
||||
{
|
||||
bool b2d = false;
|
||||
bool8 b2d = FALSE;
|
||||
|
||||
switch ( nChannel )
|
||||
{
|
||||
case CHANNEL2D:
|
||||
{
|
||||
b2d = true;
|
||||
b2d = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1925,14 +1925,14 @@ cSampleManager::GetChannelUsedFlag(uint32 nChannel)
|
|||
if ( opened_2dsamples[nChannel - MAXCHANNELS] )
|
||||
return AIL_sample_status(opened_2dsamples[nChannel - MAXCHANNELS]) == SMP_PLAYING;
|
||||
else
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( opened_samples[nChannel] )
|
||||
return AIL_3D_sample_status(opened_samples[nChannel]) == SMP_PLAYING;
|
||||
else
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1940,13 +1940,13 @@ cSampleManager::GetChannelUsedFlag(uint32 nChannel)
|
|||
void
|
||||
cSampleManager::StartChannel(uint32 nChannel)
|
||||
{
|
||||
bool b2d = false;
|
||||
bool8 b2d = FALSE;
|
||||
|
||||
switch ( nChannel )
|
||||
{
|
||||
case CHANNEL2D:
|
||||
{
|
||||
b2d = true;
|
||||
b2d = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1966,13 +1966,13 @@ cSampleManager::StartChannel(uint32 nChannel)
|
|||
void
|
||||
cSampleManager::StopChannel(uint32 nChannel)
|
||||
{
|
||||
bool b2d = false;
|
||||
bool8 b2d = FALSE;
|
||||
|
||||
switch ( nChannel )
|
||||
{
|
||||
case CHANNEL2D:
|
||||
{
|
||||
b2d = true;
|
||||
b2d = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -2024,12 +2024,12 @@ cSampleManager::PreloadStreamedFile(uint8 nFile, uint8 nStream)
|
|||
}
|
||||
|
||||
void
|
||||
cSampleManager::PauseStream(uint8 nPauseFlag, uint8 nStream)
|
||||
cSampleManager::PauseStream(bool8 nPauseFlag, uint8 nStream)
|
||||
{
|
||||
if ( m_bInitialised )
|
||||
{
|
||||
if ( mp3Stream[nStream] )
|
||||
AIL_pause_stream(mp3Stream[nStream], nPauseFlag != 0);
|
||||
AIL_pause_stream(mp3Stream[nStream], nPauseFlag != FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2043,7 +2043,7 @@ cSampleManager::StartPreloadedStreamedFile(uint8 nStream)
|
|||
}
|
||||
}
|
||||
|
||||
bool
|
||||
bool8
|
||||
cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
|
||||
{
|
||||
int i = 0;
|
||||
|
|
@ -2051,7 +2051,7 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
|
|||
char filename[MAX_PATH];
|
||||
|
||||
if ( !m_bInitialised || nFile >= TOTAL_STREAMED_SOUNDS )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
if ( mp3Stream[nStream] )
|
||||
{
|
||||
|
|
@ -2081,9 +2081,9 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
|
|||
AIL_set_stream_loop_count(mp3Stream[nStream], 1);
|
||||
AIL_set_stream_ms_position(mp3Stream[nStream], position);
|
||||
AIL_pause_stream(mp3Stream[nStream], 0);
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
} else {
|
||||
if ( e->pLinkPath != NULL )
|
||||
|
|
@ -2100,9 +2100,9 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
|
|||
AIL_set_stream_ms_position(mp3Stream[nStream], position);
|
||||
AIL_pause_stream(mp3Stream[nStream], 0);
|
||||
|
||||
_bIsMp3Active = true;
|
||||
_bIsMp3Active = TRUE;
|
||||
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
// fall through, start playing from another song
|
||||
}
|
||||
|
|
@ -2128,9 +2128,9 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
|
|||
AIL_set_stream_loop_count(mp3Stream[nStream], 1);
|
||||
AIL_set_stream_ms_position(mp3Stream[nStream], position);
|
||||
AIL_pause_stream(mp3Stream[nStream], 0);
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
if(mp3->pLinkPath != NULL)
|
||||
|
|
@ -2148,9 +2148,9 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
|
|||
AIL_set_stream_ms_position(mp3Stream[nStream], 0);
|
||||
AIL_pause_stream(mp3Stream[nStream], 0);
|
||||
#ifdef FIX_BUGS
|
||||
_bIsMp3Active = true;
|
||||
_bIsMp3Active = TRUE;
|
||||
#endif
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -2169,9 +2169,9 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
|
|||
AIL_set_stream_loop_count(mp3Stream[nStream], 1);
|
||||
AIL_set_stream_ms_position(mp3Stream[nStream], position);
|
||||
AIL_pause_stream(mp3Stream[nStream], 0);
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -2187,7 +2187,7 @@ cSampleManager::StopStreamedFile(uint8 nStream)
|
|||
mp3Stream[nStream] = NULL;
|
||||
|
||||
if ( nStream == 0 )
|
||||
_bIsMp3Active = false;
|
||||
_bIsMp3Active = FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2225,7 +2225,7 @@ cSampleManager::GetStreamedFilePosition(uint8 nStream)
|
|||
}
|
||||
|
||||
void
|
||||
cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffectFlag, uint8 nStream)
|
||||
cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, bool8 nEffectFlag, uint8 nStream)
|
||||
{
|
||||
uint8 vol = nVolume;
|
||||
|
||||
|
|
@ -2258,7 +2258,7 @@ cSampleManager::GetStreamedFileLength(uint8 nStream)
|
|||
return 0;
|
||||
}
|
||||
|
||||
bool
|
||||
bool8
|
||||
cSampleManager::IsStreamPlaying(uint8 nStream)
|
||||
{
|
||||
if ( m_bInitialised )
|
||||
|
|
@ -2266,23 +2266,23 @@ cSampleManager::IsStreamPlaying(uint8 nStream)
|
|||
if ( mp3Stream[nStream] )
|
||||
{
|
||||
if ( AIL_stream_status(mp3Stream[nStream]) == SMP_PLAYING )
|
||||
return true;
|
||||
return TRUE;
|
||||
else
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
bool
|
||||
bool8
|
||||
cSampleManager::InitialiseSampleBanks(void)
|
||||
{
|
||||
int32 nBank = SFX_BANK_0;
|
||||
|
||||
fpSampleDescHandle = fopen(SampleBankDescFilename, "rb");
|
||||
if ( fpSampleDescHandle == NULL )
|
||||
return false;
|
||||
return FALSE;
|
||||
|
||||
fpSampleDataHandle = fopen(SampleBankDataFilename, "rb");
|
||||
if ( fpSampleDataHandle == NULL )
|
||||
|
|
@ -2290,7 +2290,7 @@ cSampleManager::InitialiseSampleBanks(void)
|
|||
fclose(fpSampleDescHandle);
|
||||
fpSampleDescHandle = NULL;
|
||||
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
fseek(fpSampleDataHandle, 0, SEEK_END);
|
||||
|
|
@ -2317,7 +2317,7 @@ cSampleManager::InitialiseSampleBanks(void)
|
|||
nSampleBankSize[SFX_BANK_0] = nSampleBankDiscStartOffset[SFX_BANK_PED_COMMENTS] - nSampleBankDiscStartOffset[SFX_BANK_0];
|
||||
nSampleBankSize[SFX_BANK_PED_COMMENTS] = _nSampleDataEndOffset - nSampleBankDiscStartOffset[SFX_BANK_PED_COMMENTS];
|
||||
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue