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_mg_fshop.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_mg_fshop.cpp')
| -rw-r--r-- | src/d/actor/d_a_mg_fshop.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index cd3ff1ef19..02801d4b98 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -321,8 +321,8 @@ static int daFshop_Draw(fshop_class* i_this) { camera_class* camera = (camera_class*)dComIfGp_getCamera(0); for (int i = 0; i < 48; i++) { - f32 fVar4 = i_this->mLure[i].field_0x00.x - camera->lookat.eye.x; - f32 fVar5 = i_this->mLure[i].field_0x00.z - camera->lookat.eye.z; + f32 fVar4 = i_this->mLure[i].field_0x00.x - camera->view.lookat.eye.x; + f32 fVar5 = i_this->mLure[i].field_0x00.z - camera->view.lookat.eye.z; if (SQUARE(fVar4) + SQUARE(fVar5) > KREG_F(11) + 1200.0f) { g_env_light.setLightTevColorType_MAJI(i_this->mLure[i].model, &actor->tevStr); mDoExt_modelUpdateDL(i_this->mLure[i].model); @@ -1037,7 +1037,7 @@ static int daFshop_Execute(fshop_class* i_this) { mDoMtx_stack_c::scaleM(actor->scale.x, actor->scale.x, actor->scale.x); mDoMtx_stack_c::transM(0.0f, (190.0f + hREG_F(11)) * actor->scale.x, 0.0f); - local_cc = pmVar11->lookat.eye - actor->current.pos; + local_cc = pmVar11->view.lookat.eye - actor->current.pos; mDoMtx_stack_c::YrotM(cM_atan2s(local_cc.x, local_cc.z)); mDoMtx_stack_c::XrotM(-cM_atan2s(local_cc.y, JMAFastSqrt((local_cc.x * local_cc.x + local_cc.z * local_cc.z)))); i_this->ballModel->setBaseTRMtx(mDoMtx_stack_c::get()); |
