mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 05:51:18 +00:00
Code Issues Projects Releases Wiki Activity

Use defines for actor flags (#873)

Browse source 
* Add ACTOR_FLAG_ defines

* Add ACTOR_FLAGS_ALL macro and use ACTOR_FLAG_* constants everywhere

* Remove unused ACTOR_FLAG_* constants

* actor flags in bigokuta & ko

* actor flags in obj_mure

* actor flags in stalfos, twinrova & ganon2

* actor flags in morpha & barinade

* name some previously missed actor flags

* found some comments using hex for actor flags

* Actor flags in ovl_En_Ganon_Mant

* Actor flags in EnWf

* Flags in en_zf

* Actor flags in BossGanon (FeelsOKMan)

* Remove `ACTOR_FLAG_NONE`

* Wrap expansion of `FLAGS` in parentheses

* `ACTOR_FLAGS_ALL` -> `CHECK_FLAG_ALL`

* Move `CHECK_FLAG_ALL` to `macros.h`

* Run formatter
This commit is contained in:
Dragorn421 2021-12-06 01:11:38 +01:00 • committed by GitHub
parent 79220ba58a
commit a9284494f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
439 changed files with 1342 additions and 1304 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Fish/z_en_fish.c
View file

@ -8,7 +8,7 @@
#include "objects/gameplay_keep/gameplay_keep.h"
#include "vt.h"
#define FLAGS 0x00000000
#define FLAGS 0
void EnFish_Init(Actor* thisx, GlobalContext* globalCtx);
void EnFish_Destroy(Actor* thisx, GlobalContext* globalCtx);
@ -116,7 +116,7 @@ void EnFish_SetCutsceneData(EnFish* this) {
thisx->shape.yOffset = 600.0f;
D_80A17014 = 10.0f;
D_80A17018 = 0.0f;
thisx->flags |= 0x10;
thisx->flags |= ACTOR_FLAG_4;
EnFish_SetOutOfWaterAnimation(this);
}
}
@ -141,7 +141,7 @@ void EnFish_Init(Actor* thisx, GlobalContext* globalCtx) {
this->fastPhase = Rand_ZeroOne() * (0xFFFF + 0.5f);
if (params == FISH_DROPPED) {
this->actor.flags |= 0x10;
this->actor.flags |= ACTOR_FLAG_4;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 8.0f);
EnFish_Dropped_SetupFall(this);
} else if (params == FISH_SWIMMING_UNIQUE) {
@ -473,7 +473,7 @@ void EnFish_Dropped_FlopOnGround(EnFish* this, GlobalContext* globalCtx) {
void EnFish_Dropped_SetupSwimAway(EnFish* this) {
this->actor.home.pos = this->actor.world.pos;
this->actor.flags |= 0x10;
this->actor.flags |= ACTOR_FLAG_4;
this->timer = 200;
this->actor.gravity = 0.0f;
this->actor.minVelocityY = 0.0f;