mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 15:31:15 +00:00
Code Issues Projects Releases Wiki Activity

PLAYER_STATE1_DEAD (#2204)

Browse source 
* PLAYER_STATE1_DEAD

* change comment

* format
This commit is contained in:
fig02 2024-09-17 08:21:47 -04:00 • committed by GitHub
parent 3287437069
commit cc0b1bb127
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Rd/z_en_rd.c
View file

@ -355,7 +355,7 @@ void EnRd_WalkToPlayer(EnRd* this, PlayState* play) {
}
if ((ABS(yaw) < 0x1554) && (Actor_WorldDistXYZToActor(&this->actor, &player->actor) <= 150.0f)) {
if (!(player->stateFlags1 & (PLAYER_STATE1_7 | PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_18 |
if (!(player->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_18 |
PLAYER_STATE1_19 | PLAYER_STATE1_21)) &&
!(player->stateFlags2 & PLAYER_STATE2_7)) {
if (this->playerStunWaitTimer == 0) {
@ -430,7 +430,7 @@ void EnRd_WalkToHome(EnRd* this, PlayState* play) {
this->actor.world.rot.y = this->actor.shape.rot.y;
SkelAnime_Update(&this->skelAnime);
if (!(player->stateFlags1 & (PLAYER_STATE1_7 | PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_18 |
if (!(player->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_18 |
PLAYER_STATE1_19 | PLAYER_STATE1_21)) &&
!(player->stateFlags2 & PLAYER_STATE2_7) &&
(Actor_WorldDistXYZToPoint(&player->actor, &this->actor.home.pos) < 150.0f)) {