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

Fix visigen/hecl dependencies; Cleanup ViewManager; Various implementations

Browse Source
This commit is contained in:
Phillip Stephens
2017-08-29 06:17:52 -07:00
parent 1f7e8e1033
commit 9b5ec8f86d
41 changed files with 379 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Runtime/World/CScriptSound.cpp
View File

@@ -12,7 +12,7 @@ bool CScriptSound::sFirstInFrame = false;
CScriptSound::CScriptSound(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf,
s16 soundId, bool active, float f1, float f2, float f3, u32 w1, u32 w2, u32 w3, u32 w4,
u32 w5, u32 w6, bool b1, bool b2, bool b3, bool b4, bool b5, bool b6, bool b7, u32 w7)
u32 w5, u32 w6, bool b1, bool b2, bool autoStart, bool b4, bool b5, bool b6, bool b7, u32 w7)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(EMaterialTypes::Unknown),
CActorParameters::None(), kInvalidUniqueId)
, xfc_(f3)
@@ -29,7 +29,7 @@ CScriptSound::CScriptSound(TUniqueId uid, const std::string& name, const CEntity
{
x11c_25_ = b1;
x11c_26_ = b2;
x11c_27_ = b3;
x11c_27_autoStart = autoStart;
x11c_28_ = b4;
x11c_29_ = b5;
x11c_30_ = b6;
@@ -59,37 +59,52 @@ void CScriptSound::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CSta
{
case EScriptObjectMessage::Registered:
{
if (GetActive() && x11c_27_autoStart)
x11c_24_ = true;
x11c_31_ = mgr.GetIsGeneratingObject();
}
break;
case EScriptObjectMessage::Play:
{
if (GetActive())
PlaySound(mgr);
}
break;
case EScriptObjectMessage::Stop:
{
if (GetActive())
StopSound(mgr);
}
break;
case EScriptObjectMessage::Deactivate:
{
if (GetActive())
StopSound(mgr);
}
break;
case EScriptObjectMessage::Activate:
{
if(GetActive())
x11c_24_ = true;
}
break;
case EScriptObjectMessage::Deleted:
{
if (!x11c_30_)
StopSound(mgr);
}
break;
default:break;
}
}
void CScriptSound::PlaySound(CStateManager&) {}
void CScriptSound::PlaySound(CStateManager&)
{
}
void CScriptSound::StopSound(CStateManager& mgr)
{
x11c_24_playing = false;
x11c_24_ = false;
if (x11c_30_ && x11c_26_)
{
mgr.WorldNC()->StopSound(x100_soundId);