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

Lots of bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-05-09 21:25:26 -10:00
parent b58ebc1af5
commit 12430610f1
23 changed files with 129 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Weapon/CProjectileWeapon.cpp
View File

@@ -168,11 +168,11 @@ CProjectileWeapon::GetDecalForCollision(EWeaponCollisionResponseTypes type) cons
return x4_weaponDesc->x94_COLR.m_res->GetDecalDescription(type);
}
u16 CProjectileWeapon::GetSoundIdForCollision(EWeaponCollisionResponseTypes type) const
s32 CProjectileWeapon::GetSoundIdForCollision(EWeaponCollisionResponseTypes type) const
{
if (!x4_weaponDesc->x94_COLR)
return 0xffff;
return u16(x4_weaponDesc->x94_COLR.m_res->GetSoundEffectId(type));
return -1;
return x4_weaponDesc->x94_COLR.m_res->GetSoundEffectId(type);
}
std::experimental::optional<TLockedToken<CGenDescription>>