diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2022-03-20 11:52:09 -0400 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2022-03-20 11:52:09 -0400 |
| commit | a07d588c94f68cdc559ceb016c031c9199f0b868 (patch) | |
| tree | 839b078d07f3c727bcce8f3ce340c2639e306143 /src/muxer.cpp | |
| parent | 9458529e94ec3135a5a6fa0fbaf7e0ce1459168b (diff) | |
| download | ether-a07d588c94f68cdc559ceb016c031c9199f0b868.tar.gz ether-a07d588c94f68cdc559ceb016c031c9199f0b868.tar.bz2 ether-a07d588c94f68cdc559ceb016c031c9199f0b868.zip | |
we can now build a mac bundle!
Diffstat (limited to 'src/muxer.cpp')
| -rw-r--r-- | src/muxer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
| diff --git a/src/muxer.cpp b/src/muxer.cpp index 6ae6936..c276c0f 100644 --- a/src/muxer.cpp +++ b/src/muxer.cpp | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #include "muxer.h" | 1 | #include "muxer.h" |
| 2 | #include <iostream> | 2 | #include <iostream> |
| 3 | #include <fmod_errors.h> | 3 | #include <fmod_errors.h> |
| 4 | #include "runtime.h" | ||
| 4 | 5 | ||
| 5 | void ERRCHECK_fn(FMOD_RESULT result, const char* file, int line) { | 6 | void ERRCHECK_fn(FMOD_RESULT result, const char* file, int line) { |
| 6 | if (result != FMOD_OK) { | 7 | if (result != FMOD_OK) { |
| @@ -22,10 +23,10 @@ Muxer::Muxer() { | |||
| 22 | ERRCHECK(system_->initialize(1024, FMOD_STUDIO_INIT_NORMAL, FMOD_INIT_NORMAL, nullptr)); | 23 | ERRCHECK(system_->initialize(1024, FMOD_STUDIO_INIT_NORMAL, FMOD_INIT_NORMAL, nullptr)); |
| 23 | 24 | ||
| 24 | FMOD::Studio::Bank* masterBank = nullptr; | 25 | FMOD::Studio::Bank* masterBank = nullptr; |
| 25 | ERRCHECK(system_->loadBankFile("../res/fmod/Build/Desktop/Master Bank.bank", FMOD_STUDIO_LOAD_BANK_NORMAL, &masterBank)); | 26 | ERRCHECK(system_->loadBankFile(Runtime::getResourcePath("Master.bank").c_str(), FMOD_STUDIO_LOAD_BANK_NORMAL, &masterBank)); |
| 26 | 27 | ||
| 27 | FMOD::Studio::Bank* stringsBank = nullptr; | 28 | FMOD::Studio::Bank* stringsBank = nullptr; |
| 28 | ERRCHECK(system_->loadBankFile("../res/fmod/Build/Desktop/Master Bank.strings.bank", FMOD_STUDIO_LOAD_BANK_NORMAL, &stringsBank)); | 29 | ERRCHECK(system_->loadBankFile(Runtime::getResourcePath("Master.strings.bank").c_str(), FMOD_STUDIO_LOAD_BANK_NORMAL, &stringsBank)); |
| 29 | } | 30 | } |
| 30 | 31 | ||
| 31 | void Muxer::setPlayerLoc(int x, int y) { | 32 | void Muxer::setPlayerLoc(int x, int y) { |