diff options
| author | lepelog <25211966+lepelog@users.noreply.github.com> | 2026-10-17 00:18:07 +0200 |
|---|---|---|
| committer | lepelog <25211966+lepelog@users.noreply.github.com> | 2026-10-17 00:18:07 +0200 |
| commit | 012a744e2bec62d69e872af688beb4a2e09bbc93 (patch) | |
| tree | 01e5514a1db2ae09056e4614427eae878980fcc2 /include | |
| parent | 9c195c0a982e7f39a7936340db589df210909e41 (diff) | |
small cleanup
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/a/obj/d_a_obj_control_panel.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/include/d/a/obj/d_a_obj_control_panel.h b/include/d/a/obj/d_a_obj_control_panel.h index da971ba5..2932660d 100644 --- a/include/d/a/obj/d_a_obj_control_panel.h +++ b/include/d/a/obj/d_a_obj_control_panel.h @@ -22,18 +22,18 @@ class dAcOCtrlPnl_c : public dAcObjBase_c { class callback_c : public m3d::callback_c { public: void timingB(u32, nw4r::g3d::WorldMtxManip *, nw4r::g3d::ResMdl) override; - void setPosAndScale(int i, const mVec3_c &vec, f32 f) { - field_0x0[i] = vec; - field_0x20[i] = f; + void setPosAndScale(int tileId, const mVec3_c &vec, f32 f) { + mTilePositions[tileId] = vec; + mTileScales[tileId] = f; } void setNodeID(int i, s32 nodeID) { - mNodeIDs[i] = nodeID; + mTileNodeIDs[i] = nodeID; } private: - /* 0x00 */ mVec3_c field_0x0[8]; - /* 0x20 */ f32 field_0x20[8]; - /* 0x40 */ s32 mNodeIDs[8]; + /* 0x00 */ mVec3_c mTilePositions[8]; + /* 0x20 */ f32 mTileScales[8]; + /* 0x40 */ s32 mTileNodeIDs[8]; }; friend class callback_c; struct Spot { @@ -84,7 +84,7 @@ public: bool changedPuzzle(); bool isFirstTime(); - inline bool doChaseTilePosToTarget() { + bool doChaseTilePosToTarget() { return cLib::chasePos(mTilePositions[mMovingTile], mGrabTargetPosition, 10.f) > 0; } @@ -96,10 +96,6 @@ public: SceneflagManager::sInstance->unsetFlag(mRoomID, flag); } - s32 hasNoFlag() { - return getFromParams(0x10, 0xFF) >= 0xFF; - } - STATE_FUNC_DECLARE(dAcOCtrlPnl_c, Wait); STATE_FUNC_DECLARE(dAcOCtrlPnl_c, Control); STATE_FUNC_DECLARE(dAcOCtrlPnl_c, EndEvent); |
