From 32e66c2da8c2f9816773e1b2a0bc92804e9d20de Mon Sep 17 00:00:00 2001 From: playerskel <97991990+playerskel@users.noreply.github.com> Date: Tue, 19 Apr 2022 00:23:12 +0200 Subject: document most navi enemies as enum type (#1110) * document most navi enemies as enum type * enum value auto increments, add enemy default for 0 * also define and comment navi enemy tektite blue * Update include/z64actor.h Co-authored-by: mzxrules * Update include/z64actor.h Co-authored-by: mzxrules * Update include/z64actor.h Co-authored-by: mzxrules * Update include/z64actor.h Co-authored-by: mzxrules * Update include/z64actor.h Co-authored-by: mzxrules * Update include/z64actor.h Co-authored-by: mzxrules * apply navi enemy updates accepted so far * update names * review * review * freezzard -> freezard Co-authored-by: mzxrules Co-authored-by: fig02 --- src/code/z_actor.c | 2 +- src/code/z_view.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/code') diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 2b4887818..b59039a85 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -809,7 +809,7 @@ void Actor_Init(Actor* actor, GlobalContext* globalCtx) { actor->targetMode = 3; actor->minVelocityY = -20.0f; actor->xyzDistToPlayerSq = FLT_MAX; - actor->naviEnemyId = 0xFF; + actor->naviEnemyId = NAVI_ENEMY_NONE; actor->uncullZoneForward = 1000.0f; actor->uncullZoneScale = 350.0f; actor->uncullZoneDownward = 700.0f; diff --git a/src/code/z_view.c b/src/code/z_view.c index eb2b04c19..9ed5fad57 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -360,8 +360,8 @@ s32 View_ApplyPerspective(View* view) { } View_ErrorCheckEyePosition(view->eye.x, view->eye.y, view->eye.z); - guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->at.x, view->at.y, view->at.z, view->up.x, - view->up.y, view->up.z); + guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->at.x, view->at.y, view->at.z, view->up.x, view->up.y, + view->up.z); view->viewing = *viewing; @@ -511,8 +511,8 @@ s32 View_ApplyPerspectiveToOverlay(View* view) { } View_ErrorCheckEyePosition(view->eye.x, view->eye.y, view->eye.z); - guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->at.x, view->at.y, view->at.z, view->up.x, - view->up.y, view->up.z); + guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->at.x, view->at.y, view->at.z, view->up.x, view->up.y, + view->up.z); view->viewing = *viewing; @@ -530,8 +530,8 @@ s32 View_UpdateViewingMatrix(View* view) { OPEN_DISPS(view->gfxCtx, "../z_view.c", 878); View_ErrorCheckEyePosition(view->eye.x, view->eye.y, view->eye.z); - guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, view->at.x, view->at.y, view->at.z, - view->up.x, view->up.y, view->up.z); + guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, view->at.x, view->at.y, view->at.z, view->up.x, + view->up.y, view->up.z); CLOSE_DISPS(view->gfxCtx, "../z_view.c", 886); @@ -596,8 +596,8 @@ s32 View_ApplyTo(View* view, s32 mask, Gfx** gfxp) { view->viewingPtr = viewing; View_ErrorCheckEyePosition(view->eye.x, view->eye.y, view->eye.z); - guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->at.x, view->at.y, view->at.z, - view->up.x, view->up.y, view->up.z); + guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->at.x, view->at.y, view->at.z, view->up.x, + view->up.y, view->up.z); view->viewing = *viewing; -- cgit v1.2.3