diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-06-24 16:45:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-24 19:45:05 -0400 |
| commit | 397e481f9a3eedf2123cc2fc149468a96b473e88 (patch) | |
| tree | 13e01be757b8c9bad3412e2fb5c63557e1e207c2 /src/code/z_actor.c | |
| parent | fe7afb9b0708a46107f32f0de89d52dbca176049 (diff) | |
Fix misc 15 (#1298)
* Use `SCENE_` enum more
* Decimal for pos in `D_8011F9B8`
* `__osEventStateTab`: length `OS_NUM_EVENTS + 1` -> `OS_NUM_EVENTS`
* thone -> throne
* `s` on local data
* minor sfxId cleanup
* Run formatter
* Fixup 0x19 + 1 = 0x1A, not 0x20 lol
* Tlut -> TLUT
* DemoKankyo params usage cleanup
* Some proofreading (up to z_actor.c)
* Revert 0 -> sfxId, add todo comment (sfxId=0 is weird apparently)
* `sZdWaterBox` -> `sZorasDomainWaterBox`
* `msgMode == MSGMODE_`, not `GAMEMODE_` (my bad Sadge)
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 9811758e4..8db84b82d 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1507,7 +1507,6 @@ u32 Actor_ProcessTalkRequest(Actor* actor, PlayState* play) { s32 func_8002F1C4(Actor* actor, PlayState* play, f32 arg2, f32 arg3, u32 exchangeItemId) { Player* player = GET_PLAYER(play); - // This is convoluted but it seems like it must be a single if statement to match if ((player->actor.flags & ACTOR_FLAG_8) || ((exchangeItemId != EXCH_ITEM_NONE) && Player_InCsMode(play)) || (!actor->isTargeted && ((arg3 < fabsf(actor->yDistToPlayer)) || (player->targetActorDistance < actor->xzDistToPlayer) || @@ -2182,10 +2181,10 @@ void Actor_Draw(PlayState* play, Actor* actor) { Lights_Draw(lights, play->state.gfxCtx); if (actor->flags & ACTOR_FLAG_12) { - Matrix_SetTranslateRotateYXZ( - actor->world.pos.x + play->mainCamera.skyboxOffset.x, - actor->world.pos.y + (f32)((actor->shape.yOffset * actor->scale.y) + play->mainCamera.skyboxOffset.y), - actor->world.pos.z + play->mainCamera.skyboxOffset.z, &actor->shape.rot); + Matrix_SetTranslateRotateYXZ(actor->world.pos.x + play->mainCamera.skyboxOffset.x, + actor->world.pos.y + + ((actor->shape.yOffset * actor->scale.y) + play->mainCamera.skyboxOffset.y), + actor->world.pos.z + play->mainCamera.skyboxOffset.z, &actor->shape.rot); } else { Matrix_SetTranslateRotateYXZ(actor->world.pos.x, actor->world.pos.y + (actor->shape.yOffset * actor->scale.y), actor->world.pos.z, &actor->shape.rot); @@ -4214,14 +4213,14 @@ void Flags_SetEventChkInf(s32 flag) { } /** - * Tests if "inf_table flag is set. + * Tests if inf_table flag is set. */ s32 Flags_GetInfTable(s32 flag) { return GET_INFTABLE(flag); } /** - * Sets "inf_table" flag. + * Sets inf_table flag. */ void Flags_SetInfTable(s32 flag) { SET_INFTABLE(flag); |