diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-06-18 19:29:02 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-06-18 19:29:02 -0400 |
| commit | 264ee5d6e1cacf0c3bae2dd1a83fe15052d35b94 (patch) | |
| tree | 49897606a3505db5d750886b234d8d94d1bf54a9 /src/d/d_bg_s_acch.cpp | |
| parent | 65379a432f71d54447ca837c15eb8ff5d1c39960 (diff) | |
Clean up some inlines and field names
Diffstat (limited to 'src/d/d_bg_s_acch.cpp')
| -rw-r--r-- | src/d/d_bg_s_acch.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/d/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp index c442ed50..05399f6d 100644 --- a/src/d/d_bg_s_acch.cpp +++ b/src/d/d_bg_s_acch.cpp @@ -65,10 +65,10 @@ dBgS_Acch::dBgS_Acch() { field_0xb8 = 0.0f; m_tbl_size = 0; pm_acch_cir = NULL; - m_roof_y = 0.0f; - m_roof_crr_height = 0.0f; m_roof_height = 0.0f; - m_water_check_offset = 200.0f; + m_roof_crr_height = 0.0f; + field_0xC4 = 0.0f; + m_wtr_check_offset = 200.0f; pm_angle = NULL; pm_shape_angle = NULL; m_my_ac = NULL; @@ -156,17 +156,17 @@ void dBgS_Acch::GroundCheck(dBgS& i_bgs) { /* 800A305C-800A313C .text GroundRoofProc__9dBgS_AcchFR4dBgS */ void dBgS_Acch::GroundRoofProc(dBgS& i_bgs) { if (m_ground_h != -G_CM3D_F_INF) { - if (field_0xb8 < m_roof_height && m_roof_height < pm_pos->y) { - pm_pos->y = m_roof_height; + if (field_0xb8 < field_0xC4 && field_0xC4 < pm_pos->y) { + pm_pos->y = field_0xC4; } if (!(m_flags & ROOF_NONE)) { - if (m_ground_h >= m_roof_y) { + if (m_ground_h >= m_roof_height) { m_roof.SetExtChk(*this); ClrRoofHit(); cXyz pos = *pm_pos; m_roof.SetPos(pos); - m_roof_y = i_bgs.RoofChk(&m_roof); + m_roof_height = i_bgs.RoofChk(&m_roof); } } } @@ -248,15 +248,15 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) { LineCheck(i_bgs); } - m_roof_height = G_CM3D_F_INF; + field_0xC4 = G_CM3D_F_INF; if (!(m_flags & ROOF_NONE)) { m_roof.SetExtChk(*(cBgS_Chk*)this); ClrRoofHit(); cXyz roofPos = *pm_pos; m_roof.SetPos(roofPos); - m_roof_y = i_bgs.RoofChk(&m_roof); - if (m_roof_y != G_CM3D_F_INF && pm_pos->y + m_roof_crr_height > m_roof_y) { - m_roof_height = m_roof_y - m_roof_crr_height; + m_roof_height = i_bgs.RoofChk(&m_roof); + if (m_roof_height != G_CM3D_F_INF && pm_pos->y + m_roof_crr_height > m_roof_height) { + field_0xC4 = m_roof_height - m_roof_crr_height; SetRoofHit(); } } @@ -265,8 +265,8 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) { ClrGroundFind(); GroundCheck(i_bgs); GroundRoofProc(i_bgs); - } else if (m_roof_height < pm_pos->y) { - pm_pos->y = m_roof_height; + } else if (field_0xC4 < pm_pos->y) { + pm_pos->y = field_0xC4; } if (!(m_flags & WATER_NONE)) { |