PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match CScriptSpecialFunction::DeleteEmitter 

Former-commit-id: e48f6478f9
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-03 18:59:07 +03:00
parent 2732fd1688
commit 8cac11d25d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Kyoto/Audio/CSfxHandle.hpp
View File

@ -14,6 +14,7 @@ public:
bool operator==(const CSfxHandle& other) { return mID == other.mID; } bool operator==(const CSfxHandle& other) { return mID == other.mID; }
bool operator!=(const CSfxHandle& other) { return mID != other.mID; } bool operator!=(const CSfxHandle& other) { return mID != other.mID; }
operator bool() const { return mID != 0; } operator bool() const { return mID != 0; }
void Clear() { mID = 0; }
private: private:
uint mID; uint mID;

2
include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp
View File

@ -141,7 +141,7 @@ public:
bool ShouldSkipCinematic(CStateManager& stateMgr) const; bool ShouldSkipCinematic(CStateManager& stateMgr) const;
void DeleteEmitter(const CSfxHandle& handle); void DeleteEmitter(CSfxHandle& handle);
u32 GetSpecialEnding(const CStateManager&) const; u32 GetSpecialEnding(const CStateManager&) const;
void AddOrUpdateEmitter(float pitch, CSfxHandle& handle, u16 id, const CVector3f& pos, uchar vol); void AddOrUpdateEmitter(float pitch, CSfxHandle& handle, u16 id, const CVector3f& pos, uchar vol);
}; };

9
src/MetroidPrime/ScriptObjects/CScriptSpecialFunction.cpp
View File

@ -1078,12 +1078,11 @@ void CScriptSpecialFunction::ThinkPlayerInArea(float dt, CStateManager& mgr) {
} }
} }
void CScriptSpecialFunction::DeleteEmitter(const CSfxHandle& handle) { void CScriptSpecialFunction::DeleteEmitter(CSfxHandle& handle) {
if (!handle) { if (handle) {
return; CSfxManager::RemoveEmitter(handle);
handle.Clear();
} }
CSfxManager::RemoveEmitter(handle);
} }
u32 CScriptSpecialFunction::GetSpecialEnding(const CStateManager& mgr) const { u32 CScriptSpecialFunction::GetSpecialEnding(const CStateManager& mgr) const {