diff options
| author | robojumper <robojumper@gmail.com> | 2024-11-14 17:23:26 +0100 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2024-11-14 17:27:46 +0100 |
| commit | efb11560f73ade2a136b0021985d231cbc218287 (patch) | |
| tree | a6f6421f9ce33e70664c6c0976c1ac37c1b72a17 | |
| parent | 53c9b7062ecc47760bb8d07fd3ac1b6ea852877d (diff) | |
dAcOTowerGearD101_c::executeState_Wait OK (thanks Zeldex!)
| -rw-r--r-- | configure.py | 2 | ||||
| -rw-r--r-- | src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.py b/configure.py index 519a6d24..14a7b47c 100644 --- a/configure.py +++ b/configure.py @@ -1662,7 +1662,7 @@ config.libs = [ Rel(NonMatching, "d_a_obj_tower_bomb", "REL/d/a/obj/d_a_obj_tower_bomb.cpp"), Rel(NonMatching, "d_a_obj_tower_D101", "REL/d/a/obj/d_a_obj_tower_D101.cpp"), Rel( - NonMatching, "d_a_obj_tower_gearD101", "REL/d/a/obj/d_a_obj_tower_gearD101.cpp" + Matching, "d_a_obj_tower_gearD101", "REL/d/a/obj/d_a_obj_tower_gearD101.cpp" ), Rel( NonMatching, diff --git a/src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp b/src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp index ccf8e880..32695a6c 100644 --- a/src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp +++ b/src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp @@ -86,12 +86,11 @@ void dAcOTowerGearD101_c::initializeState_Wait() {} void dAcOTowerGearD101_c::executeState_Wait() { dAcOTowerD101_c *tower = static_cast<dAcOTowerD101_c *>(actor_node.get()); if (tower != nullptr) { - // Regswap prevRotation, newRotation tmp - mAng prevRotation = mCurrRotation; f32 diff = tower->mGoalElevation - tower->mCurrentElevation; s32 scale5 = 0x50000; + mAng prevRotation = mCurrRotation; mAng newRotation = diff * scale5 / 2400.0f; - if (newRotation != prevRotation) { + if (newRotation != mCurrRotation) { if (mPreviousTurnSpeed == 0) { playSound(0xBF8); } else { |
