diff options
| author | cadmic <cadmic24@gmail.com> | 2024-04-28 14:29:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-28 17:29:06 -0400 |
| commit | b86e1774cf04e3119306638791e86fa91585d854 (patch) | |
| tree | c066a95399b4c69679857d353863a9060be125bf /src/code | |
| parent | d4d7512cb6c4560a61cc6b7d036c4b46a6fc3a19 (diff) | |
Rename yDistToWater -> depthInWater (#1950)
* Rename yDistToWater -> yDistUnderWater
* yDistUnderWater -> depthInWater
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index ec8475535..214fa7138 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1358,8 +1358,8 @@ void Actor_UpdateBgCheckInfo(PlayState* play, Actor* actor, f32 wallCheckHeight, waterBoxYSurface = actor->world.pos.y; if (WaterBox_GetSurface1(play, &play->colCtx, actor->world.pos.x, actor->world.pos.z, &waterBoxYSurface, &waterBox)) { - actor->yDistToWater = waterBoxYSurface - actor->world.pos.y; - if (actor->yDistToWater < 0.0f) { + actor->depthInWater = waterBoxYSurface - actor->world.pos.y; + if (actor->depthInWater < 0.0f) { actor->bgCheckFlags &= ~(BGCHECKFLAG_WATER | BGCHECKFLAG_WATER_TOUCH); } else { if (!(actor->bgCheckFlags & BGCHECKFLAG_WATER)) { @@ -1379,7 +1379,7 @@ void Actor_UpdateBgCheckInfo(PlayState* play, Actor* actor, f32 wallCheckHeight, } } else { actor->bgCheckFlags &= ~(BGCHECKFLAG_WATER | BGCHECKFLAG_WATER_TOUCH); - actor->yDistToWater = BGCHECK_Y_MIN; + actor->depthInWater = BGCHECK_Y_MIN; } } } @@ -1835,7 +1835,7 @@ void func_8002F850(PlayState* play, Actor* actor) { s32 surfaceSfxOffset; if (actor->bgCheckFlags & BGCHECKFLAG_WATER) { - if (actor->yDistToWater < 20.0f) { + if (actor->depthInWater < 20.0f) { surfaceSfxOffset = SURFACE_SFX_OFFSET_WATER_SHALLOW; } else { surfaceSfxOffset = SURFACE_SFX_OFFSET_WATER_DEEP; |