diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-09-02 21:00:15 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-09-02 21:00:15 +0300 |
| commit | 33abd1b4e7a7b19e2d09c796c481c3325c1e2902 (patch) | |
| tree | 1188818ae1163b02565e091a4b83dad164266a35 /src/audio/sampman.h | |
| parent | 6a12033942d8e4421b7fbbad4c55f657cc6427d9 (diff) | |
| parent | a16fcd8d6a79e433c1c6e73d540f1bbe27e14164 (diff) | |
Merge branch 'miami' into lcslcs
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/sampman.h
# src/audio/sampman_miles.cpp
# src/audio/sampman_oal.cpp
Diffstat (limited to 'src/audio/sampman.h')
| -rw-r--r-- | src/audio/sampman.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/audio/sampman.h b/src/audio/sampman.h index cc020471..e7fe3e7f 100644 --- a/src/audio/sampman.h +++ b/src/audio/sampman.h @@ -206,12 +206,12 @@ public: bool8 LoadSampleBank (uint8 nBank); void UnloadSampleBank (uint8 nBank); - bool8 IsSampleBankLoaded(uint8 nBank); + int8 IsSampleBankLoaded(uint8 nBank); - bool8 IsMissionAudioLoaded(uint8 nSlot, uint32 nSample); + uint8 IsMissionAudioLoaded(uint8 nSlot, uint32 nSample); bool8 LoadMissionAudio (uint8 nSlot, uint32 nSample); - bool8 IsPedCommentLoaded(uint32 nComment); + uint8 IsPedCommentLoaded(uint32 nComment); bool8 LoadPedComment (uint32 nComment); int32 GetBankContainingSound(uint32 offset); |