diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2022-11-06 02:24:34 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-06 09:24:34 +0100 |
| commit | 99260acaf119b6b2b57dd10eb357fa1271bfc536 (patch) | |
| tree | 54a84799114585a484af6224c84b06fe582c9202 /soh/src/code/code_80043480.c | |
| parent | 710a768d76ca6a04ed8596b9db9d665a79400ad9 (diff) | |
Use PlayState instead of GlobalContext (#1927)
* Use PlayState instead of GlobalContext
- GlobalContext -> PlayState
- globalCtx -> play
- GlobalCtx -> PlayState
- globalContext -> playState
* Find and replace Gameplay_ with Play_
* Correct some misnamed argument cases
Diffstat (limited to 'soh/src/code/code_80043480.c')
| -rw-r--r-- | soh/src/code/code_80043480.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/soh/src/code/code_80043480.c b/soh/src/code/code_80043480.c index eda615d35..3ba733e26 100644 --- a/soh/src/code/code_80043480.c +++ b/soh/src/code/code_80043480.c @@ -76,7 +76,7 @@ s32 func_800435B4(DynaPolyActor* dynaActor) { } } -s32 func_800435D8(GlobalContext* globalCtx, DynaPolyActor* dynaActor, s16 arg2, s16 arg3, s16 arg4) { +s32 func_800435D8(PlayState* play, DynaPolyActor* dynaActor, s16 arg2, s16 arg3, s16 arg4) { Vec3f posA; Vec3f posB; Vec3f posResult; @@ -98,7 +98,7 @@ s32 func_800435D8(GlobalContext* globalCtx, DynaPolyActor* dynaActor, s16 arg2, posB.y = posA.y; posB.z = sign * a3 * cos + posA.z; - if (BgCheck_EntityLineTest3(&globalCtx->colCtx, &posA, &posB, &posResult, &poly, true, false, false, true, &bgId, + if (BgCheck_EntityLineTest3(&play->colCtx, &posA, &posB, &posResult, &poly, true, false, false, true, &bgId, &dynaActor->actor, 0.0f)) { return false; } @@ -106,7 +106,7 @@ s32 func_800435D8(GlobalContext* globalCtx, DynaPolyActor* dynaActor, s16 arg2, posA.z = (dynaActor->actor.world.pos.z * 2) - posA.z; posB.x = sign * a3 * sin + posA.x; posB.z = sign * a3 * cos + posA.z; - if (BgCheck_EntityLineTest3(&globalCtx->colCtx, &posA, &posB, &posResult, &poly, true, false, false, true, &bgId, + if (BgCheck_EntityLineTest3(&play->colCtx, &posA, &posB, &posResult, &poly, true, false, false, true, &bgId, &dynaActor->actor, 0.0f)) { return false; } |