diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-09-30 01:25:30 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-09-30 01:25:30 +0200 |
| commit | fae4c73ad3789de055b516c94dfaeda573c3050f (patch) | |
| tree | cde4b80f479c84fe4a164fe3daef1309785f17be /src | |
| parent | Use Const instead of const (last commit) (diff) | |
| parent | Fix more (diff) | |
| download | re3-fae4c73ad3789de055b516c94dfaeda573c3050f.tar re3-fae4c73ad3789de055b516c94dfaeda573c3050f.tar.gz re3-fae4c73ad3789de055b516c94dfaeda573c3050f.tar.bz2 re3-fae4c73ad3789de055b516c94dfaeda573c3050f.tar.lz re3-fae4c73ad3789de055b516c94dfaeda573c3050f.tar.xz re3-fae4c73ad3789de055b516c94dfaeda573c3050f.tar.zst re3-fae4c73ad3789de055b516c94dfaeda573c3050f.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio/sampman_null.cpp | 10 | ||||
| -rw-r--r-- | src/skel/win/win.cpp | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/audio/sampman_null.cpp b/src/audio/sampman_null.cpp index 7aab0d09..e9a9eaa1 100644 --- a/src/audio/sampman_null.cpp +++ b/src/audio/sampman_null.cpp @@ -6,7 +6,7 @@ cSampleManager SampleManager; bool _bSampmanInitialised = false; -uint32 BankStartOffset[MAX_SAMPLEBANKS]; +uint32 BankStartOffset[MAX_SFX_BANKS]; uint32 nNumMP3s; cSampleManager::cSampleManager(void) @@ -136,20 +136,20 @@ cSampleManager::SetMonoMode(uint8 nMode) bool cSampleManager::LoadSampleBank(uint8 nBank) { - ASSERT( nBank < MAX_SAMPLEBANKS ); + ASSERT( nBank < MAX_SFX_BANKS ); return false; } void cSampleManager::UnloadSampleBank(uint8 nBank) { - ASSERT( nBank < MAX_SAMPLEBANKS ); + ASSERT( nBank < MAX_SFX_BANKS ); } bool cSampleManager::IsSampleBankLoaded(uint8 nBank) { - ASSERT( nBank < MAX_SAMPLEBANKS ); + ASSERT( nBank < MAX_SFX_BANKS ); return false; } @@ -179,7 +179,7 @@ cSampleManager::LoadPedComment(uint32 nComment) int32 cSampleManager::GetBankContainingSound(uint32 offset) { - return SAMPLEBANK_INVALID; + return INVALID_SFX_BANK; } int32 diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index 5d67d343..1f609553 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -2523,8 +2523,10 @@ WinMain(HINSTANCE instance, { if ( gGameState == GS_PLAYING_GAME ) CGame::ShutDown(); +#ifndef MASTER else if ( gGameState == GS_ANIMVIEWER ) CAnimViewer::Shutdown(); +#endif CTimer::Stop(); @@ -2548,8 +2550,10 @@ WinMain(HINSTANCE instance, if ( gGameState == GS_PLAYING_GAME ) CGame::ShutDown(); +#ifndef MASTER else if ( gGameState == GS_ANIMVIEWER ) CAnimViewer::Shutdown(); +#endif DMAudio.Terminate(); |