diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-03-22 21:00:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-22 18:00:51 -0700 |
| commit | 4dc0cd9d09d5a53bf6d68f0018a8053a1507ee9a (patch) | |
| tree | 285129a59d3939a79d1d2867413fe4a1fb5aa280 /include/Z2AudioLib | |
| parent | d0f89e41b1c2dd8b434cf8a63278757b4fc8b84f (diff) | |
Debug version now builds OK and all_source compiles (#2343)
* Fix missing arg to JUT_ASSERT
* Fix some MWCC version diff errors
* Compile m_Do_ext, d_demo, actor_mng
* Add VSCode task to quickly switch between versions
* Unlink magLift for debug
* Update the hash of the debug dol
The old cbea5fa... hash here was for the dol generated by the alf2dol.py script, which produces incorrect alignment.
The dol with the new hash can be obtained by using `dtk elf2dol` to convert the debug .alf file to a dol.
The DOL now builds OK.
* Fix all debug REL dtor splits
All RELs now also build OK, meaning `ninja build/ShieldD/ok` now succeeds.
* Add genMessage declarations to all HIO subclasses
* Fixing more compilation errors
* m_Do_mtx 100% on debug
Cannot be linked due to weak function name mangling?
* Improve various matches
* Fix all remaining compilation errors
* Fix new compilation errors from main
* Fix retail regression
* Link f_pc_profile_lst
Diffstat (limited to 'include/Z2AudioLib')
| -rw-r--r-- | include/Z2AudioLib/Z2Instances.h | 52 | ||||
| -rw-r--r-- | include/Z2AudioLib/Z2SoundInfo.h | 2 |
2 files changed, 28 insertions, 26 deletions
diff --git a/include/Z2AudioLib/Z2Instances.h b/include/Z2AudioLib/Z2Instances.h index 71e2fa7433..0f1a02cdb1 100644 --- a/include/Z2AudioLib/Z2Instances.h +++ b/include/Z2AudioLib/Z2Instances.h @@ -7,30 +7,30 @@ #include "JSystem/JAudio2/JAUSoundTable.h" #define AUDIO_INSTANCES \ - JASDefaultBankTable* JASGlobalInstance<JASDefaultBankTable>::sInstance; \ - JASAudioThread* JASGlobalInstance<JASAudioThread>::sInstance; \ - Z2SeMgr* JASGlobalInstance<Z2SeMgr>::sInstance; \ - Z2SeqMgr* JASGlobalInstance<Z2SeqMgr>::sInstance; \ - Z2SceneMgr* JASGlobalInstance<Z2SceneMgr>::sInstance; \ - Z2StatusMgr* JASGlobalInstance<Z2StatusMgr>::sInstance; \ - Z2DebugSys* JASGlobalInstance<Z2DebugSys>::sInstance; \ - JAISoundStarter* JASGlobalInstance<JAISoundStarter>::sInstance; \ - Z2SoundStarter* JASGlobalInstance<Z2SoundStarter>::sInstance; \ - Z2SpeechMgr2* JASGlobalInstance<Z2SpeechMgr2>::sInstance; \ - JAISeMgr* JASGlobalInstance<JAISeMgr>::sInstance; \ - JAISeqMgr* JASGlobalInstance<JAISeqMgr>::sInstance; \ - JAIStreamMgr* JASGlobalInstance<JAIStreamMgr>::sInstance; \ - Z2SoundMgr* JASGlobalInstance<Z2SoundMgr>::sInstance; \ - JAISoundInfo* JASGlobalInstance<JAISoundInfo>::sInstance; \ - JAUSoundTable* JASGlobalInstance<JAUSoundTable>::sInstance; \ - JAUSoundNameTable* JASGlobalInstance<JAUSoundNameTable>::sInstance; \ - JAUSoundInfo* JASGlobalInstance<JAUSoundInfo>::sInstance; \ - Z2SoundInfo* JASGlobalInstance<Z2SoundInfo>::sInstance; \ - Z2SoundObjMgr* JASGlobalInstance<Z2SoundObjMgr>::sInstance; \ - Z2Audience* JASGlobalInstance<Z2Audience>::sInstance; \ - Z2FxLineMgr* JASGlobalInstance<Z2FxLineMgr>::sInstance; \ - Z2EnvSeMgr* JASGlobalInstance<Z2EnvSeMgr>::sInstance; \ - Z2SpeechMgr* JASGlobalInstance<Z2SpeechMgr>::sInstance; \ - Z2WolfHowlMgr* JASGlobalInstance<Z2WolfHowlMgr>::sInstance; + template<> JASDefaultBankTable* JASGlobalInstance<JASDefaultBankTable>::sInstance; \ + template<> JASAudioThread* JASGlobalInstance<JASAudioThread>::sInstance; \ + template<> Z2SeMgr* JASGlobalInstance<Z2SeMgr>::sInstance; \ + template<> Z2SeqMgr* JASGlobalInstance<Z2SeqMgr>::sInstance; \ + template<> Z2SceneMgr* JASGlobalInstance<Z2SceneMgr>::sInstance; \ + template<> Z2StatusMgr* JASGlobalInstance<Z2StatusMgr>::sInstance; \ + template<> Z2DebugSys* JASGlobalInstance<Z2DebugSys>::sInstance; \ + template<> JAISoundStarter* JASGlobalInstance<JAISoundStarter>::sInstance; \ + template<> Z2SoundStarter* JASGlobalInstance<Z2SoundStarter>::sInstance; \ + template<> Z2SpeechMgr2* JASGlobalInstance<Z2SpeechMgr2>::sInstance; \ + template<> JAISeMgr* JASGlobalInstance<JAISeMgr>::sInstance; \ + template<> JAISeqMgr* JASGlobalInstance<JAISeqMgr>::sInstance; \ + template<> JAIStreamMgr* JASGlobalInstance<JAIStreamMgr>::sInstance; \ + template<> Z2SoundMgr* JASGlobalInstance<Z2SoundMgr>::sInstance; \ + template<> JAISoundInfo* JASGlobalInstance<JAISoundInfo>::sInstance; \ + template<> JAUSoundTable* JASGlobalInstance<JAUSoundTable>::sInstance; \ + template<> JAUSoundNameTable* JASGlobalInstance<JAUSoundNameTable>::sInstance; \ + template<> JAUSoundInfo* JASGlobalInstance<JAUSoundInfo>::sInstance; \ + template<> Z2SoundInfo* JASGlobalInstance<Z2SoundInfo>::sInstance; \ + template<> Z2SoundObjMgr* JASGlobalInstance<Z2SoundObjMgr>::sInstance; \ + template<> Z2Audience* JASGlobalInstance<Z2Audience>::sInstance; \ + template<> Z2FxLineMgr* JASGlobalInstance<Z2FxLineMgr>::sInstance; \ + template<> Z2EnvSeMgr* JASGlobalInstance<Z2EnvSeMgr>::sInstance; \ + template<> Z2SpeechMgr* JASGlobalInstance<Z2SpeechMgr>::sInstance; \ + template<> Z2WolfHowlMgr* JASGlobalInstance<Z2WolfHowlMgr>::sInstance; -#endif
\ No newline at end of file +#endif diff --git a/include/Z2AudioLib/Z2SoundInfo.h b/include/Z2AudioLib/Z2SoundInfo.h index df17a68936..668a1164cb 100644 --- a/include/Z2AudioLib/Z2SoundInfo.h +++ b/include/Z2AudioLib/Z2SoundInfo.h @@ -23,6 +23,8 @@ public: /* 802BBA10 */ const char* getStreamFilePath(JAISoundID); /* 802BBAC8 */ int getSwBit(JAISoundID) const; /* 802BBB48 */ void getSoundInfo_(JAISoundID, JAISound*) const; + + BOOL isValid() const; }; |