diff options
| author | robojumper <robojumper@gmail.com> | 2025-05-04 13:53:32 +0200 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2025-05-10 22:24:13 +0200 |
| commit | a800282135ee151fc1caff780cc1e0d988657d6e (patch) | |
| tree | 20df86aaa41de66a9d8c7bfe89ab5197329391dd /src/d/a/obj/d_a_obj_switch.cpp | |
| parent | a8023aa4fa5781b3543dae1c9d10de9f03f3b711 (diff) | |
Refactoring
Diffstat (limited to 'src/d/a/obj/d_a_obj_switch.cpp')
| -rw-r--r-- | src/d/a/obj/d_a_obj_switch.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/d/a/obj/d_a_obj_switch.cpp b/src/d/a/obj/d_a_obj_switch.cpp index 43546938..8103d7a7 100644 --- a/src/d/a/obj/d_a_obj_switch.cpp +++ b/src/d/a/obj/d_a_obj_switch.cpp @@ -6,6 +6,8 @@ #include "d/flag/sceneflag_manager.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_Math.h" +#include "toBeSorted/effects_struct.h" +#include "toBeSorted/small_sound_mgr.h" SPECIAL_ACTOR_PROFILE(OBJ_SW, dAcOsw_c, fProfile::OBJ_SW, 0x12B, 0, 0x1002); @@ -144,7 +146,6 @@ int dAcOsw_c::doDelete() { } extern "C" u16 PARTICLE_RESOURCE_ID_MAPPING_754_; -extern "C" void fn_800298B0(u16, mVec3_c *, mAng3_c *, u32, u32, u32, u32, u32); int dAcOsw_c::actorExecute() { mStateMgr.executeState(); @@ -153,8 +154,8 @@ int dAcOsw_c::actorExecute() { if (field_0x5A0.field_0x00 <= 0.0f) { if (mScale.x >= 1.0f) { if (!mHidden) { - fn_800298B0(PARTICLE_RESOURCE_ID_MAPPING_754_, &position, &rotation, 0, 0, 0, 0, 0); - playSound(0xC0B); + dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_754_, position, &rotation, nullptr, nullptr, nullptr, 0, 0); + playSound(SE_TIMESLIP_TIMESLIP_REV); mHidden = true; } } else { @@ -166,8 +167,8 @@ int dAcOsw_c::actorExecute() { } else { if (mScale.x <= 0.0f) { if (!mShown) { - fn_800298B0(PARTICLE_RESOURCE_ID_MAPPING_754_, &position, &rotation, 0, 0, 0, 0, 0); - playSound(0xC0A); + dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_754_, position, &rotation, nullptr, nullptr, nullptr, 0, 0); + playSound(SE_TIMESLIP_TIMESLIP); mShown = true; } } else { |