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

Defines for player state flags (#1081)

Browse source 
* script-assisted player state flags

* Run formatter

* manually convert state flags in `D_80116068`

* `PLAYER_STATE_FLAG_` -> `PLAYER_STATE`

* Run formatter
This commit is contained in:
Dragorn421 2022-01-18 01:04:07 +01:00 • committed by GitHub
parent 2a4fb604fb
commit 6479913daa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
96 changed files with 945 additions and 810 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
View file

@ -163,7 +163,7 @@ void EnBombf_GrowBomb(EnBombf* this, GlobalContext* globalCtx) {
player->heldActor = NULL;
player->interactRangeActor = NULL;
this->actor.parent = NULL;
player->stateFlags1 &= ~0x800;
player->stateFlags1 &= ~PLAYER_STATE1_11;
}
} else if (this->bombCollider.base.acFlags & AC_HIT) {
this->bombCollider.base.acFlags &= ~AC_HIT;
@ -199,7 +199,7 @@ void EnBombf_GrowBomb(EnBombf* this, GlobalContext* globalCtx) {
player->heldActor = NULL;
player->interactRangeActor = NULL;
this->actor.parent = NULL;
player->stateFlags1 &= ~0x800;
player->stateFlags1 &= ~PLAYER_STATE1_11;
this->actor.world.pos = this->actor.home.pos;
}
}
@ -217,7 +217,7 @@ void EnBombf_GrowBomb(EnBombf* this, GlobalContext* globalCtx) {
player->heldActor = NULL;
player->interactRangeActor = NULL;
this->actor.parent = NULL;
player->stateFlags1 &= ~0x800;
player->stateFlags1 &= ~PLAYER_STATE1_11;
this->actor.world.pos = this->actor.home.pos;
}
}
@ -301,11 +301,11 @@ void EnBombf_Explode(EnBombf* this, GlobalContext* globalCtx) {
if (this->timer == 0) {
player = GET_PLAYER(globalCtx);
if ((player->stateFlags1 & 0x800) && (player->heldActor == &this->actor)) {
if ((player->stateFlags1 & PLAYER_STATE1_11) && (player->heldActor == &this->actor)) {
player->actor.child = NULL;
player->heldActor = NULL;
player->interactRangeActor = NULL;
player->stateFlags1 &= ~0x800;
player->stateFlags1 &= ~PLAYER_STATE1_11;
}
Actor_Kill(&this->actor);