diff options
| author | robojumper <robojumper@gmail.com> | 2025-07-26 18:08:58 +0200 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2025-07-26 18:11:18 +0200 |
| commit | 58866f517f5cb0c2eb138d334a43b8e3da4f9b76 (patch) | |
| tree | 366c55a3a70db54139b8081426c970544ce1bf0d /src/d/d_cs_base.cpp | |
| parent | 4ec5128eb4f6cdc8985f83f4c8b540115daf47fb (diff) | |
d_pad_nav OK
Diffstat (limited to 'src/d/d_cs_base.cpp')
| -rw-r--r-- | src/d/d_cs_base.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/d/d_cs_base.cpp b/src/d/d_cs_base.cpp index 1326c80c..e95a73c5 100644 --- a/src/d/d_cs_base.cpp +++ b/src/d/d_cs_base.cpp @@ -1,6 +1,8 @@ #include "d/d_cs_base.h" #include "common.h" +#include "d/d_pad_nav.h" +#include "d/lyt/d_lyt_cursor_stick.h" #include "f/f_base.h" #include "f/f_profile_name.h" #include "nw4r/math/math_types.h" @@ -26,11 +28,6 @@ dCsBase_c::~dCsBase_c() { sInstance = nullptr; } -extern "C" void fn_8016B2B0(); -extern "C" void fn_8016B2E0(); -extern "C" bool lbl_80572D10; -extern "C" int lbl_80573438; - static const char *sLytNames[] = { "P1_Def.brlyt", "P1_Cat.brlyt", @@ -49,7 +46,7 @@ int dCsBase_c::create() { setCurrentLyt(0); mCursorIf.setCursorMask(1); dCsMgr_c::GetInstance()->registCursor(&mCursorIf); - fn_8016B2B0(); + dLytCursorStick_c::build(); field_0x6F0 = 0.0f; field_0x6F4 = 0.0f; field_0x6F8 = 0.0f; @@ -64,7 +61,7 @@ int dCsBase_c::create() { int dCsBase_c::doDelete() { dCsMgr_c::GetInstance()->unregistCursor(&mCursorIf); - fn_8016B2E0(); + dLytCursorStick_c::remove(); mResAcc.detach(); return SUCCEEDED; } @@ -80,7 +77,7 @@ int dCsBase_c::draw() { return SUCCEEDED; } - if (field_0x703 && lbl_80572D10 && field_0x702) { + if (field_0x703 && dPadNav::isPointerVisible() && field_0x702) { nw4r::lyt::Pane *p = mpCurrLyt->getLayout()->GetRootPane(); nw4r::math::VEC3 pos; pos.x = field_0x6F0; @@ -108,7 +105,7 @@ bool dCsBase_c::drawDirectly() { return true; } - if (field_0x703 && lbl_80572D10 && field_0x702) { + if (field_0x703 && dPadNav::isPointerVisible() && field_0x702) { nw4r::lyt::Pane *p = mpCurrLyt->getLayout()->GetRootPane(); nw4r::math::VEC3 pos; pos.x = field_0x6F0; |