mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-11 11:32:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

G_CM3D_F_INF

Browse Source
This commit is contained in:
LagoLunatic
2025-05-21 16:46:21 -04:00
parent ee2e164fa2
commit 21cd7a2f67
55 changed files with 147 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_ib.cpp
+4 -4
View File
@@ -207,7 +207,7 @@ void daIball_c::checkGeo() {
lavaChk.SetPos(&pos);
f32 lavaY = dComIfG_Bgsp()->GroundCross(&lavaChk);
f32 groundH = mAcch.GetGroundH();
if (lavaY != C_BG_MIN_HEIGHT) {
if (lavaY != -G_CM3D_F_INF) {
f32 lava_depth = lavaY - groundH;
if ((lava_depth < 20.0f && lavaY > current.pos.y) || (lava_depth >= 20.0f && lavaY > current.pos.y + 20.0f)) {
fopAcM_seStartCurrent(this, JA_SE_OBJ_FALL_MAGMA_S, 0);
@@ -239,7 +239,7 @@ void daIball_c::mode_wait() {
}
f32 seaHeight = mAcch.GetSeaHeight();
if (seaHeight > current.pos.y && seaHeight != C_BG_MIN_HEIGHT) {
if (seaHeight > current.pos.y && seaHeight != -G_CM3D_F_INF) {
mode_water_init();
current.pos.y = seaHeight;
}
@@ -255,10 +255,10 @@ void daIball_c::mode_water_init() {
/* 800F3FE8-800F4054 .text mode_water__9daIball_cFv */
void daIball_c::mode_water() {
f32 seaHeight = mAcch.GetSeaHeight();
if (seaHeight == C_BG_MIN_HEIGHT || seaHeight < current.pos.y) {
if (seaHeight == -G_CM3D_F_INF || seaHeight < current.pos.y) {
mode_wait_init();
}
if (seaHeight != C_BG_MIN_HEIGHT) {
if (seaHeight != -G_CM3D_F_INF) {
current.pos.y = seaHeight;
}
}