diff --git a/include/d/a/obj/d_a_obj_underground_switch.h b/include/d/a/obj/d_a_obj_underground_switch.h index 5ee463a8..a52084b7 100644 --- a/include/d/a/obj/d_a_obj_underground_switch.h +++ b/include/d/a/obj/d_a_obj_underground_switch.h @@ -29,15 +29,6 @@ private: static const f32 sActivationRadius; static const u8 sEventTimer; - void setRes(void *data) { - mRes = data; - } - - nw4r::g3d::ResMdl getMdl(void *data) { - mRes = data; - return mRes.GetResMdl("SwitchPass"); - } - /* 0x330 */ nw4r::g3d::ResFile mRes; /* 0x334 */ m3d::smdl_c mMdl; /* 0x350 */ STATE_MGR_DECLARE(dAcOUgSwitch_c); diff --git a/src/REL/d/a/obj/d_a_obj_underground_switch.cpp b/src/REL/d/a/obj/d_a_obj_underground_switch.cpp index f080be5e..04ab2bf6 100644 --- a/src/REL/d/a/obj/d_a_obj_underground_switch.cpp +++ b/src/REL/d/a/obj/d_a_obj_underground_switch.cpp @@ -21,16 +21,16 @@ const u8 dAcOUgSwitch_c::sEventTimer = 15; bool dAcOUgSwitch_c::createHeap() { // Why. Regswap... void *data = getOarcResFile("SwitchPass"); - + mRes = data; nw4r::g3d::ResMdl mdl = mRes.GetResMdl("SwitchPass"); TRY_CREATE(mMdl.create(mdl, &heap_allocator, 0x120)); - + mRes = data; mdl = mRes.GetResMdl("SwitchPass"); nw4r::g3d::ResAnmClr clr = mRes.GetResAnmClr("SwitchPass_Light"); TRY_CREATE(mAnmClr.create(mdl, clr, &heap_allocator, nullptr, 1)); - + mMdl.setAnm(mAnmClr); return true;