From e345323f0ae32306b9b6de8ffa3950c1dcea8e8a Mon Sep 17 00:00:00 2001 From: TakaRikka Date: Tue, 9 Jun 2026 03:28:40 -0700 Subject: [PATCH] add los swpush variant --- include/d/actor/d_a_obj_swpush.h | 8 ++++---- src/d/actor/d_a_obj_swpush.cpp | 26 ++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/include/d/actor/d_a_obj_swpush.h b/include/d/actor/d_a_obj_swpush.h index 5c73d2b310..544a32d9fb 100644 --- a/include/d/actor/d_a_obj_swpush.h +++ b/include/d/actor/d_a_obj_swpush.h @@ -142,12 +142,12 @@ namespace daObjSwpush { int Mthd_Execute(); int Mthd_Draw(); - static s16 const M_bmd[3]; - static s16 const M_dzb[3]; - static u32 const M_heap_size[3]; + static s16 const M_bmd[DUSK_IF_ELSE(4, 3)]; + static s16 const M_dzb[DUSK_IF_ELSE(4, 3)]; + static u32 const M_heap_size[DUSK_IF_ELSE(4, 3)]; static Hio_c::Attr_c const M_attr[5]; static u8 const M_op_vtx[4]; - static DUSK_CONST char* M_arcname[3]; + static DUSK_CONST char* M_arcname[DUSK_IF_ELSE(4, 3)]; /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ dBgWSv* mpBgW; diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index 5cdf0f4372..617173642f 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -54,14 +54,27 @@ BOOL daObjSwpush::Act_c::solidHeapCB(fopAc_ac_c* a_this) { return static_cast(a_this)->create_heap(); } -s16 const daObjSwpush::Act_c::M_bmd[3] = {BMDR_KBOTA_00, BMDR_S_LV3BOTA, BMDR_S_LV6BOTA}; +s16 const daObjSwpush::Act_c::M_bmd[DUSK_IF_ELSE(4, 3)] = { + BMDR_KBOTA_00, BMDR_S_LV3BOTA, BMDR_S_LV6BOTA, +#if TARGET_PC + 4 +#endif +}; -s16 const daObjSwpush::Act_c::M_dzb[3] = {DZB_KBOTA_00, DZB_KBOTA2_00, DZB_KBOTA3_00}; +s16 const daObjSwpush::Act_c::M_dzb[DUSK_IF_ELSE(4, 3)] = { + DZB_KBOTA_00, DZB_KBOTA2_00, DZB_KBOTA3_00, +#if TARGET_PC + 7 +#endif +}; -DUSK_CONST char* daObjSwpush::Act_c::M_arcname[3] = { +DUSK_CONST char* daObjSwpush::Act_c::M_arcname[DUSK_IF_ELSE(4, 3)] = { "Kbota_00", "S_lv3bota", "S_lv6bota", +#if TARGET_PC + "S_losbota", +#endif }; bool daObjSwpush::Act_c::create_heap() { @@ -117,7 +130,12 @@ cPhs_Step daObjSwpush::Act_c::create_res_load() { return cPhs_COMPLEATE_e; } -u32 const daObjSwpush::Act_c::M_heap_size[3] = {0x1000, 0x1000, 0x1000}; +u32 const daObjSwpush::Act_c::M_heap_size[DUSK_IF_ELSE(4, 3)] = { + 0x1000, 0x1000, 0x1000, +#if TARGET_PC + 0x2000, +#endif +}; daObjSwpush::Hio_c::Attr_c const daObjSwpush::Act_c::M_attr[5] = { {