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

Final CCollisionInfoList imps

Browse Source
This commit is contained in:
Phillip Stephens
2020-02-07 14:20:04 -08:00
parent 6ac01741a4
commit 60f8dfb9d1
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/World/ScriptLoader.cpp
View File

@@ -689,8 +689,11 @@ CEntity* ScriptLoader::LoadSound(CStateManager& mgr, CInputStream& in, int propC
bool allowDuplicates = in.readBool();
s32 pitch = in.readInt32Big();
if (soundId < 0)
if (soundId < 0) {
Log.report(logvisor::Warning, fmt("Invalid sound ID specified in Sound {} ({}), dropping..."), head.x0_name,
info.GetEditorId());
return nullptr;
}
return new CScriptSound(mgr.AllocateUniqueId(), head.x0_name, info, head.x10_transform, u16(soundId), active, maxDist,
distComp, startDelay, minVol, vol, 0, prio, pan, 0, loop, nonEmitter, autoStart,