AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 15:07:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix CGuiTextSupport crash

Browse Source
This commit is contained in:
Phillip Stephens
2017-07-07 05:23:20 -07:00
parent bfb16a3a0d
commit b22c0bc75f
14 changed files with 126 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Runtime/World/CScriptSound.cpp
View File

@@ -1,6 +1,8 @@
#include "CScriptSound.hpp"
#include "Character/CModelData.hpp"
#include "Collision/CMaterialList.hpp"
#include "CStateManager.hpp"
#include "CWorld.hpp"
#include "CActorParameters.hpp"
#include "TCastTo.hpp"
@@ -45,7 +47,9 @@ void CScriptSound::PreThink(float dt, CStateManager& mgr)
x11d_25_ = false;
}
void CScriptSound::Think(float, CStateManager&) {}
void CScriptSound::Think(float dt, CStateManager& mgr)
{
}
void CScriptSound::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr)
{
@@ -83,7 +87,18 @@ void CScriptSound::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CSta
void CScriptSound::PlaySound(CStateManager&) {}
void CScriptSound::StopSound()
void CScriptSound::StopSound(CStateManager& mgr)
{
x11c_24_playing = false;
if (x11c_30_ && x11c_26_)
{
mgr.WorldNC()->StopSound(x100_soundId);
xec_sfxHandle.reset();
}
else if (xec_sfxHandle)
{
CSfxManager::RemoveEmitter(xec_sfxHandle);
xec_sfxHandle.reset();
}
}
}