PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Almost match CGunMorph::StartWipe

This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-06 20:05:59 +03:00
parent 7fac18cc48
commit 55820e0a07
No known key found for this signature in database
GPG Key ID: E224F951761145F8
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/MetroidPrime/Player/CPlayerGun.cpp
View File

@ -600,7 +600,22 @@ CPlayerGun::CGunMorph::CGunMorph(float gunTransformTime, float holoHoldTime)
, x24_24_morphing(false)
, x24_25_weaponChanged(false) {}
void CPlayerGun::CGunMorph::StartWipe(CPlayerGun::CGunMorph::EDir) {}
void CPlayerGun::CGunMorph::StartWipe(CPlayerGun::CGunMorph::EDir dir) {
x14_remHoldTime = x10_holoHoldTime;
if (dir == kD_In && x20_gunState == kGS_InWipeDone)
return;
if (x1c_dir != dir && x20_gunState != kGS_OutWipe) {
x8_remTime = x4_gunTransformTime;
xc_speed = 1.f / x4_gunTransformTime;
} else if (x20_gunState != kGS_InWipe) {
x8_remTime = x4_gunTransformTime - x8_remTime;
}
x1c_dir = dir;
x20_gunState = x1c_dir == kD_In ? kGS_InWipe : kGS_OutWipe;
x24_24_morphing = true;
}
CPlayerGun::CGunMorph::EMorphEvent CPlayerGun::CGunMorph::Update(float, float, float) {
return kME_None;