mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-19 05:22:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

C_BG_MIN_HEIGHT, C_BG_MAX_HEIGHT

Browse Source
This commit is contained in:
LagoLunatic
2025-03-06 20:41:37 -05:00
parent 0e508ad721
commit 49c69eeb0f
46 changed files with 147 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_bg_s_acch.cpp
+11 -11
View File
@@ -56,7 +56,7 @@ dBgS_Acch::dBgS_Acch() {
pm_pos = NULL;
pm_old_pos = NULL;
pm_speed = NULL;
m_ground_h = -1000000000.0f;
m_ground_h = C_BG_MIN_HEIGHT;
m_ground_up_h = 0.0f;
m_ground_check_offset = 60.0f;
m_ground_up_h_diff = 0.0f;
@@ -73,7 +73,7 @@ dBgS_Acch::dBgS_Acch() {
pm_shape_angle = NULL;
m_my_ac = NULL;
pm_out_poly_info = NULL;
m_sea_height = -1000000000.0f;
m_sea_height = C_BG_MIN_HEIGHT;
}
static void dummy1() {
@@ -108,7 +108,7 @@ void dBgS_Acch::Set(cXyz* pos, cXyz* old_pos, fopAc_ac_c* actor, int tbl_size, d
/* 800A2E80-800A2EE8 .text GroundCheckInit__9dBgS_AcchFR4dBgS */
void dBgS_Acch::GroundCheckInit(dBgS&) {
m_ground_h = -1000000000.0f;
m_ground_h = C_BG_MIN_HEIGHT;
if (m_flags & GRND_NONE) {
return;
}
@@ -131,7 +131,7 @@ void dBgS_Acch::GroundCheck(dBgS& i_bgs) {
m_gnd.m_pos = pos;
m_ground_h = i_bgs.GroundCross(&m_gnd);
if (m_ground_h != -1000000000.0f) {
if (m_ground_h != C_BG_MIN_HEIGHT) {
field_0xb8 = m_ground_h + m_ground_up_h;
if (field_0xb8 > field_0xb4) {
pm_pos->y = field_0xb8;
@@ -155,8 +155,8 @@ void dBgS_Acch::GroundCheck(dBgS& i_bgs) {
/* 800A305C-800A313C .text GroundRoofProc__9dBgS_AcchFR4dBgS */
f32 dBgS_Acch::GroundRoofProc(dBgS& i_bgs) {
f32 y = -1000000000.0f;
if (m_ground_h != -1000000000.0f) {
f32 y = C_BG_MIN_HEIGHT;
if (m_ground_h != C_BG_MIN_HEIGHT) {
// y = m_roof_height;
// fakematch to fix load order
if (field_0xb8 < (y = m_roof_height) && y < pm_pos->y) {
@@ -257,14 +257,14 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) {
LineCheck(i_bgs);
}
m_roof_height = 1000000000.0f;
m_roof_height = C_BG_MAX_HEIGHT;
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 != 1000000000.0f && pm_pos->y + m_roof_crr_height > m_roof_y) {
if (m_roof_y != C_BG_MAX_HEIGHT && pm_pos->y + m_roof_crr_height > m_roof_y) {
m_roof_height = m_roof_y - m_roof_crr_height;
SetRoofHit();
}
@@ -281,10 +281,10 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) {
if (!(m_flags & WATER_NONE)) {
ClrWaterHit();
ClrWaterIn();
m_wtr.SetHeight(-1000000000.0f);
m_wtr.SetHeight(C_BG_MIN_HEIGHT);
int room_no = i_bgs.GetRoomId(m_gnd);
if (m_ground_h != -1000000000.0f && 0 <= room_no && room_no < 64) {
if (m_ground_h != C_BG_MIN_HEIGHT && 0 <= room_no && room_no < 64) {
JUT_ASSERT(693, 0 <= room_no && room_no < 64);
dBgW* bgw = dComIfGp_roomControl_getBgW(room_no);
@@ -312,7 +312,7 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) {
if (ChkSeaCheckOn()) {
m_flags &= ~SEA_IN;
m_sea_height = -1000000000.0f;
m_sea_height = C_BG_MIN_HEIGHT;
if (daSea_ChkArea(pm_pos->x, pm_pos->z)) {
m_sea_height = daSea_calcWave(pm_pos->x, pm_pos->z);