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

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

6
src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c
View file

@ -7,7 +7,7 @@
#include "z_obj_hsblock.h"
#include "objects/object_d_hsblock/object_d_hsblock.h"
#define FLAGS 0x00000000
#define FLAGS 0
void ObjHsblock_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjHsblock_Destroy(Actor* thisx, GlobalContext* globalCtx);
@ -110,7 +110,7 @@ void func_80B93D90(ObjHsblock* this) {
}
void func_80B93DB0(ObjHsblock* this) {
this->dyna.actor.flags |= 0x10;
this->dyna.actor.flags |= ACTOR_FLAG_4;
this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 105.0f;
ObjHsblock_SetupAction(this, func_80B93DF4);
}
@ -131,7 +131,7 @@ void func_80B93E5C(ObjHsblock* this, GlobalContext* globalCtx) {
this->dyna.actor.velocity.y, 0.3f)) < 0.001f) {
this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y;
func_80B93D90(this);
this->dyna.actor.flags &= ~0x10;
this->dyna.actor.flags &= ~ACTOR_FLAG_4;
}
}