diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-29 10:31:13 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-29 10:31:13 +0300 |
| commit | eeacbfeb6ac8c594c8f5c2e770300129c8d54eea (patch) | |
| tree | 6010523f07d3c7eb2684fd8bdbcbe5d0cd9f3fe7 /src/audio/sampman_miles.cpp | |
| parent | 2be8fcfa64a9925206ed2356c2934c7559873a6a (diff) | |
| parent | 9a7b469f4e7249ff0c0ecd72b2c28036d71e599d (diff) | |
Merge branch 'miami' into lcs
Diffstat (limited to 'src/audio/sampman_miles.cpp')
| -rw-r--r-- | src/audio/sampman_miles.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index 9e412e4a..65cfff01 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -377,15 +377,15 @@ SetUpDebugBanksInfo() gBankStartOffset[43] = SFX_BUILDING_BAR_2; gBankStartOffset[44] = SFX_BUILDING_BAR_3; gBankStartOffset[45] = SFX_BUILDING_BAR_4; - gBankStartOffset[46] = SFX_BUILDING_MAL1; - gBankStartOffset[47] = SFX_BUILDING_MAL2; + gBankStartOffset[46] = SFX_BUILDING_MALIBU_1; + gBankStartOffset[47] = SFX_BUILDING_MALIBU_2; gBankStartOffset[42] = SFX_BUILDING_BAR_1; - gBankStartOffset[49] = SFX_BUILDING_STR1; - gBankStartOffset[50] = SFX_BUILDING_STR2; - gBankStartOffset[51] = SFX_BUILDING_STR3; + gBankStartOffset[49] = SFX_BUILDING_STRIP_1; + gBankStartOffset[50] = SFX_BUILDING_STRIP_2; + gBankStartOffset[51] = SFX_BUILDING_STRIP_3; gBankStartOffset[52] = SFX_BUILDING_CHURCH; gBankStartOffset[53] = SFX_BUILDING_FAN_1; - gBankStartOffset[48] = SFX_BUILDING_MAL3; + gBankStartOffset[48] = SFX_BUILDING_MALIBU_3; gBankStartOffset[55] = SFX_BUILDING_INSECTS_1; gBankStartOffset[56] = SFX_BUILDING_INSECTS_2; gBankStartOffset[54] = SFX_BUILDING_FAN_2; @@ -1721,13 +1721,13 @@ cSampleManager::GetBankContainingSound(uint32 offset) return INVALID_SFX_BANK; } -int32 +uint32 cSampleManager::GetSampleBaseFrequency(uint32 nSample) { return m_aSamples[nSample].nFrequency; } -int32 +uint32 cSampleManager::GetSampleLoopStartOffset(uint32 nSample) { return m_aSamples[nSample].nLoopStart; |