diff options
| author | Maciek Baron <1668712+MaciekBaron@users.noreply.github.com> | 2025-07-11 23:04:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-11 16:04:02 -0600 |
| commit | 7bb37c6ace16f1006fbeeafc42f01967debaf0c0 (patch) | |
| tree | 6612b7fbaa0c6f70232f291a525fce76cfff32ee /src/engine/objects | |
| parent | 6a8baf89369374a4e3bbccb5b45d5de36eb7e843 (diff) | |
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 <MegaMech@users.noreply.github.com>
Diffstat (limited to 'src/engine/objects')
| -rw-r--r-- | src/engine/objects/Thwomp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); } } } |