mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-07 14:13:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into m_Do_audio2

Browse Source
This commit is contained in:
jdflyer
2021-01-21 21:58:53 -07:00
parent ff7ac962f1 a072e71c33
commit 64bb8562fa
798 changed files with 7656 additions and 12286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/Z2AudioLib/Z2SceneMgr.cpp
+3 -1
View File
@@ -1,6 +1,7 @@
#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
#include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h"
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h"
#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
@@ -117,8 +118,9 @@ asm void Z2SceneMgr::setSceneName(char* stageName, long roomNum, long layerNum){
#include "Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s"
}
//! @meme this looks to be non-inlined here because @ref setSceneName is too large
JAISoundID::JAISoundID(JAISoundID const& soundIdToSet) {
this->soundId = soundIdToSet.soundId;
mId = soundIdToSet.mId;
return;
}