C_BG_MIN_HEIGHT, C_BG_MAX_HEIGHT

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
+4 -3
View File
@@ -1,8 +1,7 @@
#ifndef D_A_BOMB_H
#define D_A_BOMB_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_a_obj.h"
#include "f_op/f_op_actor.h"
#include "d/d_particle.h"
#include "d/d_bg_s_acch.h"
#include "d/d_cc_d.h"
@@ -178,7 +177,9 @@ private:
/* 0x2FC */ dBgS_BombAcch mAcch;
/* 0x4C0 */ dBgS_AcchCir mCir;
/* 0x500 */ dBgS_ObjGndChk_Yogan mGndChk;
/* 0x554 */ cXyz field_0x554;
/* 0x554 */ f32 field_0x554;
/* 0x558 */ f32 field_0x558;
/* 0x55C */ f32 field_0x55C;
/* 0x560 */ bool field_0x560;
/* 0x561 */ bool mbWaterIn;
/* 0x562 */ u8 field_0x562;
+1 -2
View File
@@ -1,8 +1,7 @@
#ifndef D_A_BOMB_2_H
#define D_A_BOMB_2_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_a_obj.h"
#include "f_op/f_op_actor.h"
#include "d/d_particle.h"
#include "d/d_bg_s_acch.h"
#include "d/d_cc_d.h"
+1 -1
View File
@@ -121,7 +121,7 @@ public:
mWallRadius = 0.0f;
pm_pos = NULL;
pm_old_pos = NULL;
mGroundH = C_BG_INVALID_HEIGHT;
mGroundH = C_BG_MIN_HEIGHT;
field_0x60 = 0;
field_0x68 = 20.0f;
field_0x58 = NULL;
+2 -2
View File
@@ -2982,10 +2982,10 @@ int dComIfGd_setShadow(u32 id, s8 param_2, J3DModel* pModel, cXyz* pPos, f32 par
s16 rotY = 0, f32 param_12 = 1.0f,
GXTexObj* pTexObj = dDlst_shadowControl_c::getSimpleTex());
inline int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cXyz* param_3,
inline int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 groundY, f32 param_2, cXyz* param_3,
s16 i_angle = 0, f32 param_5 = 1.0f,
GXTexObj* i_tex = dDlst_shadowControl_c::getSimpleTex()) {
return g_dComIfG_gameInfo.drawlist.setSimpleShadow(i_pos, param_1, param_2, param_3, i_angle,
return g_dComIfG_gameInfo.drawlist.setSimpleShadow(i_pos, groundY, param_2, param_3, i_angle,
param_5, i_tex);
}
+2 -2
View File
@@ -551,9 +551,9 @@ public:
void drawXluListInvisible() { drawXluDrawList(mpXluListInvisible); }
void drawOpaList2D() { drawOpaDrawList(mpOpaList2D); }
int setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cXyz* param_3, s16 i_angle,
int setSimpleShadow(cXyz* i_pos, f32 groundY, f32 param_2, cXyz* param_3, s16 i_angle,
f32 param_5, GXTexObj* i_tex) {
return mShadowControl.setSimple(i_pos, param_1, param_2, param_3, i_angle, param_5,
return mShadowControl.setSimple(i_pos, groundY, param_2, param_3, i_angle, param_5,
i_tex);
}
int setRealShadow(u32 id, s8 param_2, J3DModel* pModel, cXyz* pPos, f32 param_5, f32 param_6,