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 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

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

@ -339,7 +339,9 @@ void EnBombf_Update(Actor* thisx, GlobalContext* globalCtx) {
if (thisx->gravity != 0.0f) {
DREG(6) = 1;
Actor_UpdateBgCheckInfo(globalCtx, thisx, 5.0f, 10.0f, 0.0f, 0x1F);
Actor_UpdateBgCheckInfo(globalCtx, thisx, 5.0f, 10.0f, 0.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_2 |
UPDBGCHECKINFO_FLAG_3 | UPDBGCHECKINFO_FLAG_4);
DREG(6) = 0;
}
@ -359,7 +361,9 @@ void EnBombf_Update(Actor* thisx, GlobalContext* globalCtx) {
Audio_PlayActorSound2(thisx, NA_SE_EV_BOMB_BOUND);
Actor_MoveForward(thisx);
DREG(6) = 1;
Actor_UpdateBgCheckInfo(globalCtx, thisx, 5.0f, 10.0f, 0.0f, 0x1F);
Actor_UpdateBgCheckInfo(globalCtx, thisx, 5.0f, 10.0f, 0.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_2 |
UPDBGCHECKINFO_FLAG_3 | UPDBGCHECKINFO_FLAG_4);
DREG(6) = 0;
thisx->speedXZ *= 0.7f;
thisx->bgCheckFlags &= ~BGCHECKFLAG_WALL;