diff options
| author | Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> | 2025-05-18 18:24:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-18 18:24:58 -0400 |
| commit | 9d688025070b6646fc332c6405448ce01b8a9dd2 (patch) | |
| tree | 53690c4e58d8b5a0fedb351fdfc2b8ce1458b126 /src/d/a/obj/d_a_obj_switch.cpp | |
| parent | d19aad44d13a7e17a3615b25d9368ff15069a395 (diff) | |
d_a_e_sm (chu chu) start (#117)
* d_a_e_sm (chu chu) start
* progress, includes LightParam addition in BlurPaletteMgr
* oops - TBox Progress I guess
* dAcEsm_c::actorExecute and Particle Resource data moved
* step in symbols map
* Update blur_and_palette_manager.h
* m_angle cleanup pass
* Last explicit_zero_data Fixes #69
* add mQuat_c ctor
Diffstat (limited to 'src/d/a/obj/d_a_obj_switch.cpp')
| -rw-r--r-- | src/d/a/obj/d_a_obj_switch.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/d/a/obj/d_a_obj_switch.cpp b/src/d/a/obj/d_a_obj_switch.cpp index 3bedebf6..f8145bbe 100644 --- a/src/d/a/obj/d_a_obj_switch.cpp +++ b/src/d/a/obj/d_a_obj_switch.cpp @@ -145,8 +145,6 @@ int dAcOsw_c::doDelete() { return SUCCEEDED; } -extern "C" u16 PARTICLE_RESOURCE_ID_MAPPING_754_; - int dAcOsw_c::actorExecute() { mStateMgr.executeState(); if (mCanBeSeen) { @@ -154,7 +152,9 @@ int dAcOsw_c::actorExecute() { if (field_0x5A0.field_0x00 <= 0.0f) { if (mScale.x >= 1.0f) { if (!mHidden) { - dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_754_, position, &rotation, nullptr, nullptr, nullptr, 0, 0); + dJEffManager_c::spawnEffect( + PARTICLE_RESOURCE_ID_MAPPING_754_, position, &rotation, nullptr, nullptr, nullptr, 0, 0 + ); playSound(SE_TIMESLIP_TIMESLIP_REV); mHidden = true; } @@ -167,7 +167,9 @@ int dAcOsw_c::actorExecute() { } else { if (mScale.x <= 0.0f) { if (!mShown) { - dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_754_, position, &rotation, nullptr, nullptr, nullptr, 0, 0); + dJEffManager_c::spawnEffect( + PARTICLE_RESOURCE_ID_MAPPING_754_, position, &rotation, nullptr, nullptr, nullptr, 0, 0 + ); playSound(SE_TIMESLIP_TIMESLIP); mShown = true; } |