From 715022174ac664c99170f76ee96f7a41ca7aa7fd Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Tue, 16 Sep 2025 22:42:28 -0400 Subject: [PATCH] fix regressions --- config/SOUE01/rels/d_a_obj_tumble_weedNP/symbols.txt | 2 +- include/d/a/obj/d_a_obj_tumble_weed.h | 2 +- src/REL/d/a/obj/d_a_obj_tumble_weed.cpp | 2 +- src/d/a/d_a_base.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/SOUE01/rels/d_a_obj_tumble_weedNP/symbols.txt b/config/SOUE01/rels/d_a_obj_tumble_weedNP/symbols.txt index a46cd2fd..6a915787 100644 --- a/config/SOUE01/rels/d_a_obj_tumble_weedNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_tumble_weedNP/symbols.txt @@ -39,7 +39,7 @@ adjustTumble__16dAcOTumbleWeed_cFRC7mVec3_c = .text:0x00001A70; // type:function setWind__16dAcOTumbleWeed_cFRC7mVec3_c = .text:0x00001B00; // type:function size:0x4C calcWind__16dAcOTumbleWeed_cFv = .text:0x00001B50; // type:function size:0xD0 calcTimer__4sLibFPUc_Uc = .text:0x00001C20; // type:function size:0x1C -getPosition__16dAcOTumbleWeed_cCFv = .text:0x00001C40; // type:function size:0xAC +getTumblePosition__16dAcOTumbleWeed_cCFv = .text:0x00001C40; // type:function size:0xAC __dt__16dAcOTumbleWeed_cFv = .text:0x00001CF0; // type:function size:0x10C getStateID__85sStateMgr_c<16dAcOTumbleWeed_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001E00; // type:function size:0x10 build__32sFStateFct_c<16dAcOTumbleWeed_c>FRC12sStateIDIf_c = .text:0x00001E10; // type:function size:0x60 diff --git a/include/d/a/obj/d_a_obj_tumble_weed.h b/include/d/a/obj/d_a_obj_tumble_weed.h index 91654683..e87012ad 100644 --- a/include/d/a/obj/d_a_obj_tumble_weed.h +++ b/include/d/a/obj/d_a_obj_tumble_weed.h @@ -34,7 +34,7 @@ public: void adjustTimeScale(); void adjustTumble(const mVec3_c &dir); void calcWind(); - mVec3_c getPosition() const; + mVec3_c getTumblePosition() const; void calcMatrix(); void adjustAngle(); diff --git a/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp b/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp index 57c4f286..3467b984 100644 --- a/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp +++ b/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp @@ -382,7 +382,7 @@ void dAcOTumbleWeed_c::calcWind() { } } -mVec3_c dAcOTumbleWeed_c::getPosition() const { +mVec3_c dAcOTumbleWeed_c::getTumblePosition() const { mMtx_c mtx; mVec3_c vec; mtx.ZXYrotS(mRotation.x, mRotation.y, mRotation.z); diff --git a/src/d/a/d_a_base.cpp b/src/d/a/d_a_base.cpp index 50a37cf4..6461fa21 100644 --- a/src/d/a/d_a_base.cpp +++ b/src/d/a/d_a_base.cpp @@ -61,7 +61,7 @@ dAcBase_c::dAcBase_c() } if (s_Create_Rotation) { - mRotation = *s_Create_Rotation; + setRotation(*s_Create_Rotation); } if (s_Create_Scale) {