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

Defines for Actor#bgCheckFlags (#1126)

Browse source 
* First pass, tool assisted bgCheckFlags

* Few manual bgCheckFlags

* Run formatter

* Remove fake bgCheckFlags 10-15

* Move existing documentation to the defines

* Comment on `bgCheckFlags` and rephrase some doc

* Name obvious flags, and some cleanup

* Comment on flag 9 being wall-interaction-related (thanks engineer and fig)

* Run formatter

* `BGCHECKFLAG_7` -> `BGCHECKFLAG_GROUND_STRICT`

* Touch up water-related bgcheckflags doc

* `BGCHECKFLAG_9` -> `BGCHECKFLAG_PLAYER_WALL_INTERACT`
This commit is contained in:
Dragorn421 2022-02-19 03:16:19 +01:00 • committed by GitHub
parent 251d90301c
commit 67f294774b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
121 changed files with 711 additions and 652 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Skj/z_en_skj.c
View file

@ -670,8 +670,8 @@ void EnSkj_Fade(EnSkj* this, GlobalContext* globalCtx) {
}
if (this->actor.velocity.y <= 0.0f) {
if (this->actor.bgCheckFlags & 2) {
this->actor.bgCheckFlags &= ~2;
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) {
this->actor.bgCheckFlags &= ~BGCHECKFLAG_GROUND_TOUCH;
func_80AFF2A0(this);
}
}
@ -1090,8 +1090,8 @@ void EnSkj_JumpFromStump(EnSkj* this) {
void EnSkj_WaitForLanding(EnSkj* this, GlobalContext* globalCtx) {
if (this->actor.velocity.y <= 0.0f) {
if (this->actor.bgCheckFlags & 2) {
this->actor.bgCheckFlags &= ~2;
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) {
this->actor.bgCheckFlags &= ~BGCHECKFLAG_GROUND_TOUCH;
this->actor.speedXZ = 0.0f;
EnSkj_SetupWaitForLandAnimFinish(this);
}