mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-08-25 16:15:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add kartPropulsionStrength and waterInteractionFlags (#425)

Browse Source 
* 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>
This commit is contained in:
Maciek Baron
2025-07-11 23:04:02 +01:00
committed by GitHub
parent 6a8baf8936
commit 7bb37c6ace
17 changed files with 197 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Thwomp.cpp
+3 -3
View File
@@ -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);
}
}
}