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

Defines for flags passed to Actor_UpdateBgCheckInfo (#1127)

Browse source 
* Tool-assisted flags for `Actor_UpdateBgCheckInfo`

* Manual flags separation

* Run formatter

* Light doc on the flags

* `UPDBGCHECKINFOFLAG_` -> `UPDBGCHECKINFO_FLAG_` (what an improvement!)

* Run formatter

* Run formatter
This commit is contained in:
Dragorn421 2022-02-21 00:41:55 +01:00 • committed by GitHub
parent 85ce3d3ca4
commit b9cc31dc74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
183 changed files with 459 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/overlays/actors/ovl_En_Part/z_en_part.c
View file

@ -104,7 +104,9 @@ void func_80ACE13C(EnPart* this, GlobalContext* globalCtx) {
Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
if ((this->actor.params == 12) || (this->actor.params == 13)) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 5.0f, 15.0f, 0.0f, 0x1D);
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 5.0f, 15.0f, 0.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);
if ((this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) || (this->actor.world.pos.y <= this->actor.floorHeight)) {
this->action = 4;
@ -244,7 +246,8 @@ void EnPart_Update(Actor* thisx, GlobalContext* globalCtx) {
Actor_MoveForward(&this->actor);
if ((this->actor.params > 4 && this->actor.params < 9) || this->actor.params < 0) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 5.0f, 15.0f, 0.0f, 5);
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 5.0f, 15.0f, 0.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
if (this->actor.params >= 0) {
Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f);
if (thisx->bgCheckFlags & BGCHECKFLAG_GROUND) {