diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2026-03-06 22:30:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-06 22:30:25 -0800 |
| commit | 30e839c28be83fb07bfbe008d3eb9eb9127e3801 (patch) | |
| tree | 5b63a788dcbc6cbefc46ca6a9c2f2a3248be1dfe /src/d/actor/d_a_npc_ne.cpp | |
| parent | 6c72b91f8e477ee94ccdc56b94605140e9f2abd6 (diff) | |
d_s_room / d_s_name / d_a_title debug work (#3123)
* d_s_room / d_s_name debug work
* camera_class rtti fix
* d_a_title debug / handle shield rel changes
* fix shield build
* fix regressions
Diffstat (limited to 'src/d/actor/d_a_npc_ne.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_ne.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index 5d1c8bde1e..a424218841 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -2345,13 +2345,13 @@ static void action(npc_ne_class* i_this) { } else if (!i_this->mNoFollow) { if (i_this->mDistToTarget > 700.0f && fopAcM_CheckCondition(_this, 4) && player->speedF > 2.0f) { - camera_class* camera = dComIfGp_getCamera(0); - vec1.x = camera->lookat.eye.x - camera->lookat.center.x; - vec1.z = camera->lookat.eye.z - camera->lookat.center.z; + camera_process_class* camera = dComIfGp_getCamera(0); + vec1.x = camera->view.lookat.eye.x - camera->view.lookat.center.x; + vec1.z = camera->view.lookat.eye.z - camera->view.lookat.center.z; mDoMtx_YrotS(*calc_mtx, cM_atan2s(vec1.x, vec1.z)); vec1.set(0.0f, -50.0f, 100.0f); MtxPosition(&vec1, &vec2); - vec2 += camera->lookat.eye; + vec2 += camera->view.lookat.eye; dBgS_ObjGndChk_Spl gnd_chk_spl; gnd_chk_spl.SetPos(&vec2); f32 cross = dComIfG_Bgsp().GroundCross(&gnd_chk_spl); @@ -2603,7 +2603,7 @@ static void action(npc_ne_class* i_this) { static void demo_camera(npc_ne_class* i_this) { fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this); daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0)); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (i_this->mDemoTimer != 0) { i_this->mDemoTimer--; |
