diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-10-13 02:03:49 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-10-13 02:03:49 -0400 |
| commit | f99fcde4f1092bfe00472becbf9eb70b459c370f (patch) | |
| tree | dbbb6b5b669ab587a52dc87afe90acdee971c6af /include | |
| parent | 733c274260bcfd0056d9c79b268f8d8c229d9b56 (diff) | |
d_a_obj_hcbh OK for demo, use res enums
Diffstat (limited to 'include')
| -rw-r--r-- | include/SSystem/SComponent/c_m3d_g_sph.h | 3 | ||||
| -rw-r--r-- | include/d/actor/d_a_obj_hcbh.h | 18 |
2 files changed, 13 insertions, 8 deletions
diff --git a/include/SSystem/SComponent/c_m3d_g_sph.h b/include/SSystem/SComponent/c_m3d_g_sph.h index 9d8403f0..5972e033 100644 --- a/include/SSystem/SComponent/c_m3d_g_sph.h +++ b/include/SSystem/SComponent/c_m3d_g_sph.h @@ -23,11 +23,12 @@ public: #if VERSION == VERSION_DEMO void SetC(const cXyz& p) { mCenter = p; } void SetR(f32 r) { mRadius = r; } + void SetC(f32 x, f32 y, f32 z) { mCenter.x = x; mCenter.y = y; mCenter.z = z; } #else void SetC(const cXyz& p); void SetR(f32 r); + void SetC(f32 x, f32 y, f32 z) { SetC(cXyz(x, y, z)); } #endif - void SetC(f32 x, f32 y, f32 z) { mCenter.x = x; mCenter.y = y; mCenter.z = z; } void Set(const cM3dGSphS & src) { #if VERSION == VERSION_DEMO mCenter = src.mCenter; diff --git a/include/d/actor/d_a_obj_hcbh.h b/include/d/actor/d_a_obj_hcbh.h index 49b5d5c4..8e66d50a 100644 --- a/include/d/actor/d_a_obj_hcbh.h +++ b/include/d/actor/d_a_obj_hcbh.h @@ -2,27 +2,31 @@ #define D_A_OBJ_HCBH_H #include "d/d_a_obj.h" +#include "d/d_bg_s_acch.h" +#include "d/d_particle.h" #include "f_op/f_op_actor.h" #include "d/d_cc_d.h" +class dBgW; + class daObjHcbh_c : public fopAc_ac_c { public: enum Param_e { - PRM_ITEM_W = 0x06, - PRM_ITEM_S = 0x00, + PRM_ITEMNO_W = 0x06, + PRM_ITEMNO_S = 0x00, PRM_ITEMBIT_W = 0x07, PRM_ITEMBIT_S = 0x06, PRM_SWSAVE_W = 0x08, PRM_SWSAVE_S = 0x0D, }; - Param_e param_get_itemNo() const { return daObj::PrmAbstract(this, PRM_ITEM_W, PRM_ITEM_S); } - Param_e param_get_itemSaveBitNo() const { return daObj::PrmAbstract(this, PRM_ITEMBIT_W, PRM_ITEMBIT_S); } - Param_e param_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); } + int param_get_itemNo() const { return daObj::PrmAbstract(this, PRM_ITEMNO_W, PRM_ITEMNO_S); } + int param_get_itemSaveBitNo() const { return daObj::PrmAbstract(this, PRM_ITEMBIT_W, PRM_ITEMBIT_S); } + int param_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); } void param_on_swSave() const { - Param_e saveParam = param_get_swSave(); + const int saveParam = param_get_swSave(); if (saveParam != 0xFF) { - dComIfGs_onSwitch(saveParam, fopAcM_GetHomeRoomNo((fopAc_ac_c*)this)); + fopAcM_onSwitch(const_cast<daObjHcbh_c*>(this), saveParam); } } |