AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CBloodFlower: Use GetLctrTransform for projectile pos

This commit is contained in:
Luke Street 2020-09-26 09:41:28 -04:00
parent 732be1f7ea
commit 6b51f32f99
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/MP1/World/CBloodFlower.cpp
View File

@ -104,7 +104,7 @@ void CBloodFlower::Think(float dt, CStateManager& mgr) {
void CBloodFlower::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUserEventType type, float dt) { void CBloodFlower::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUserEventType type, float dt) {
if (type == EUserEventType::Projectile) { if (type == EUserEventType::Projectile) {
if (x58c_projectileState == 1 && x5bc_projectileDelay <= 0.f) { if (x58c_projectileState == 1 && x5bc_projectileDelay <= 0.f) {
LaunchPollenProjectile(GetLocatorTransform(node.GetLocatorName()), mgr, x614_, 5); LaunchPollenProjectile(GetLctrTransform(node.GetLocatorName()), mgr, x614_, 5);
x58c_projectileState = 0; x58c_projectileState = 0;
x5bc_projectileDelay = 0.5f; x5bc_projectileDelay = 0.5f;
} }
@ -116,11 +116,11 @@ void CBloodFlower::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node
CPatterned::DoUserAnimEvent(mgr, node, type, dt); CPatterned::DoUserAnimEvent(mgr, node, type, dt);
} }
void CBloodFlower::LaunchPollenProjectile(const zeus::CTransform& xf, CStateManager& mgr, float var_f1, s32 w1) { void CBloodFlower::LaunchPollenProjectile(const zeus::CTransform& xf, CStateManager& mgr, float var_f1, s32 maxProjectiles) {
CProjectileInfo* proj = GetProjectileInfo(); CProjectileInfo* proj = GetProjectileInfo();
TLockedToken<CWeaponDescription> projToken = proj->Token(); TLockedToken<CWeaponDescription> projToken = proj->Token();
if (!projToken || !mgr.CanCreateProjectile(GetUniqueId(), EWeaponType::AI, w1)) if (!projToken || !mgr.CanCreateProjectile(GetUniqueId(), EWeaponType::AI, maxProjectiles))
return; return;
zeus::CVector3f aimPos = mgr.GetPlayer().GetAimPosition(mgr, 0.f); zeus::CVector3f aimPos = mgr.GetPlayer().GetAimPosition(mgr, 0.f);