From 7bb37c6ace16f1006fbeeafc42f01967debaf0c0 Mon Sep 17 00:00:00 2001 From: Maciek Baron <1668712+MaciekBaron@users.noreply.github.com> Date: Fri, 11 Jul 2025 23:04:02 +0100 Subject: Add kartPropulsionStrength and waterInteractionFlags (#425) * Add kartPropulsionStrength and waterInteractionFlags * Add reset_player_speed_and_velocity * Fix merge * Reorder and cleanup * Document hopVerticalOffset and hopFrameCounter * Fix missed variabled * Further things * Use constant --------- Co-authored-by: MegaMech --- src/engine/objects/Thwomp.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/engine/objects') diff --git a/src/engine/objects/Thwomp.cpp b/src/engine/objects/Thwomp.cpp index b783395b7..2f8281cb6 100644 --- a/src/engine/objects/Thwomp.cpp +++ b/src/engine/objects/Thwomp.cpp @@ -54,7 +54,7 @@ OThwomp::OThwomp(s16 x, s16 z, s16 direction, f32 scale, s16 behaviour, s16 prim _faceDirection = direction; _boundingBoxSize = boundingBoxSize; State = (States)behaviour; - + find_unused_obj_index(&_objectIndex); s32 objectId = _objectIndex; @@ -650,11 +650,11 @@ void OThwomp::func_80080B28(s32 objectIndex, s32 playerId) { player->unk_040 = (s16) objectIndex; player->unk_046 |= 2; player->soundEffects |= 0x100; - func_80088FF0(player); + reset_player_speed_and_velocity(player); } } } else { - func_80088FF0(player); + reset_player_speed_and_velocity(player); } } } -- cgit v1.2.3