summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorswekka <swekka@proton.me>2025-10-12 00:56:42 +0200
committerswekka <swekka@proton.me>2025-10-12 00:56:42 +0200
commit795d581820af560756f40fbf700e2fc9f8ec9303 (patch)
treebe085899f3de37c30cbde1bacc37c50e8fd885c8 /src
parent2e95c466ee9719b6527c9353ede8c0ee864be140 (diff)
match create
Diffstat (limited to 'src')
-rw-r--r--src/REL/d/a/obj/d_a_obj_windmill.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/REL/d/a/obj/d_a_obj_windmill.cpp b/src/REL/d/a/obj/d_a_obj_windmill.cpp
index 2b013399..a1cb28de 100644
--- a/src/REL/d/a/obj/d_a_obj_windmill.cpp
+++ b/src/REL/d/a/obj/d_a_obj_windmill.cpp
@@ -66,7 +66,7 @@ int dAcOwindmill_c::create() {
mSetRotation = getFromParams(0, 0xF);
mSceneFlagInPlace = getFromParams(4, 0xFF);
mSceneFlagBeingBlown = getFromParams(0xC, 0xFF);
- mWindmillRotation = mRotation.y;
+ mWindmillRotation = mRotation.y.mVal;
mWindmillPosition = mPosition;
mWindmillPosition.x += -95.22334f * (mRotation.y + mAng(0xc17)).sin();
@@ -82,12 +82,12 @@ int dAcOwindmill_c::create() {
mAnmClr.setFrame(0.f, 0);
field_0x634 = mAnmClr.getFrameMax(0) - 1.f;
if (isLightTowerRaised2() || SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSceneFlagInPlace)) {
- s32 delta = mSetRotation - mCurrentStuckPos;
+ s8 delta = mSetRotation - mCurrentStuckPos;
if (delta < 0) {
- delta = 0xC;
+ delta += 0xC;
}
- mCurrentStuckPos = mSetRotation;
mRotation.y += 0x1555 * delta;
+ mCurrentStuckPos = mSetRotation;
mStateMgr.changeState(StateID_CollectStick);
mTimer1 = 0;
mTimer2 = 0;