mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-27 11:34:29 +00:00
Code Issues Projects Releases Wiki Activity

Name it prevInvincibilityTimer

Browse source
This commit is contained in:
Sirius902 2020-10-18 18:08:43 -07:00
parent 011dab8cc8
commit f7cd4e20e9
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

@ -755,7 +755,7 @@ void func_80A75FA0(Actor* thisx, GlobalContext* globalCtx) {
EnIk* this = THIS; EnIk* this = THIS;
s32 pad; s32 pad;
Player* player = PLAYER; Player* player = PLAYER;
u8 sp33; u8 prevInvincibilityTimer;
this->unk_2FA = this->unk_2FB; this->unk_2FA = this->unk_2FB;
func_80A75C38(this, globalCtx); func_80A75C38(this, globalCtx);
@ -764,10 +764,10 @@ void func_80A75FA0(Actor* thisx, GlobalContext* globalCtx) {
return; return;
} }
this->actionFunc(this, globalCtx); this->actionFunc(this, globalCtx);
if ((this->unk_36C.base.atFlags & 2)) { if (this->unk_36C.base.atFlags & 2) {
this->unk_36C.base.atFlags &= 0xFFFD; this->unk_36C.base.atFlags &= ~0x2;
if (&player->actor == this->unk_36C.base.at) { if (&player->actor == this->unk_36C.base.at) {
sp33 = player->invincibilityTimer; prevInvincibilityTimer = player->invincibilityTimer;
if (player->invincibilityTimer <= 0) { if (player->invincibilityTimer <= 0) {
if (player->invincibilityTimer < -39) { if (player->invincibilityTimer < -39) {
player->invincibilityTimer = 0; player->invincibilityTimer = 0;
@ -778,7 +778,7 @@ void func_80A75FA0(Actor* thisx, GlobalContext* globalCtx) {
} }
} }
func_8002F71C(globalCtx, &this->actor, 8.0f, this->actor.yawTowardsLink, 8.0f); func_8002F71C(globalCtx, &this->actor, 8.0f, this->actor.yawTowardsLink, 8.0f);
player->invincibilityTimer = sp33; player->invincibilityTimer = prevInvincibilityTimer;
} }
} }
Actor_MoveForward(&this->actor); Actor_MoveForward(&this->actor);