diff options
| author | Max Roncace <me@caseif.net> | 2025-08-24 02:52:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-24 09:52:08 +0300 |
| commit | 513816ce5c055be898b80dfa3b7048bcaca876a7 (patch) | |
| tree | 85ac5e0383eb1ef1e4442c95f7c63c2c146098ae /src/Z2AudioLib | |
| parent | 8a30030dc73931727bd3d6327c1a37255a295f3f (diff) | |
Add a precompiled header for RELs (#2597)
Diffstat (limited to 'src/Z2AudioLib')
| -rw-r--r-- | src/Z2AudioLib/Z2Calc.cpp | 2 | ||||
| -rw-r--r-- | src/Z2AudioLib/Z2EnvSeMgr.cpp | 7 | ||||
| -rw-r--r-- | src/Z2AudioLib/Z2SoundObject.cpp | 8 |
3 files changed, 5 insertions, 12 deletions
diff --git a/src/Z2AudioLib/Z2Calc.cpp b/src/Z2AudioLib/Z2Calc.cpp index 67a08ec2ad..ba2d32a19c 100644 --- a/src/Z2AudioLib/Z2Calc.cpp +++ b/src/Z2AudioLib/Z2Calc.cpp @@ -139,4 +139,4 @@ f32 Z2Calc::FNoise1f::calcNoise1f(void) { this->unk4 = temp2; return this->unk0; -}
\ No newline at end of file +} diff --git a/src/Z2AudioLib/Z2EnvSeMgr.cpp b/src/Z2AudioLib/Z2EnvSeMgr.cpp index 7d7004897a..8fc04e2b3a 100644 --- a/src/Z2AudioLib/Z2EnvSeMgr.cpp +++ b/src/Z2AudioLib/Z2EnvSeMgr.cpp @@ -85,9 +85,6 @@ bool Z2EnvSeBase::startEnvSeLevel(JAISoundID param_1, f32 param_2, f32 param_3, return rv; } -/* 8039C250-8039C260 0288B0 000C+04 2/2 0/0 0/0 .rodata cNullVec__6Z2Calc */ -static Vec const cNullVec__6Z2Calc = {0.0f, 0.0f, 0.0f}; - /* 802C5C9C-802C5D1C 2C05DC 0080+00 1/1 0/0 0/0 .text __ct__10Z2EnvSeDirFP3Vec */ Z2EnvSeDir::Z2EnvSeDir(Vec* param_0) { field_0x8 = 0.5f; @@ -95,7 +92,7 @@ Z2EnvSeDir::Z2EnvSeDir(Vec* param_0) { if (param_0) { setPanDir(param_0); } else { - mPanDir = cNullVec__6Z2Calc; + mPanDir = Z2Calc::cNullVec; } } @@ -895,7 +892,7 @@ void Z2EnvSeMgr::initStrongWindSe() { /* 802C7FC8-802C800C 2C2908 0044+00 0/0 1/1 1/1 .text setWindDirection__10Z2EnvSeMgrFP3Vec */ void Z2EnvSeMgr::setWindDirection(Vec* param_0) { if (mWindType == WIND_TYPE_3) { - field_0x144.setPanDir((Vec*)&cNullVec__6Z2Calc); + field_0x144.setPanDir(const_cast<Vec*>(&Z2Calc::cNullVec)); } else { field_0x144.setPanDir(param_0); } diff --git a/src/Z2AudioLib/Z2SoundObject.cpp b/src/Z2AudioLib/Z2SoundObject.cpp index 58b1c8ce9d..839b7730b6 100644 --- a/src/Z2AudioLib/Z2SoundObject.cpp +++ b/src/Z2AudioLib/Z2SoundObject.cpp @@ -177,14 +177,10 @@ Z2SoundHandlePool* Z2SoundObjBase::startCollisionSE(u32 pId, u32 pUserData, Z2So return handle; } -/* ############################################################################################## */ -/* 8039C230-8039C240 028890 000C+04 1/1 0/0 0/0 .rodata cNullVec__6Z2Calc */ -static Vec const cNullVec__6Z2Calc = {0.0f, 0.0f, 0.0f}; - /* 802BE5A0-802BE5FC 2B8EE0 005C+00 1/1 0/0 0/0 .text __ct__21Z2DopplerSoundObjBaseFv */ Z2DopplerSoundObjBase::Z2DopplerSoundObjBase() : Z2SoundObjBase() { - field_0x20 = cNullVec__6Z2Calc; - field_0x2c = cNullVec__6Z2Calc; + field_0x20 = Z2Calc::cNullVec; + field_0x2c = Z2Calc::cNullVec; } /* 802BE5FC-802BE65C 2B8F3C 0060+00 0/0 0/0 1/1 .text __dt__21Z2DopplerSoundObjBaseFv */ |