etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-29 23:43:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sanity check torsoPos to prevent phantom collisions

Browse source
This commit is contained in:
MysterD 2020-09-29 18:05:37 -07:00
parent 4ade00ac78
commit a2dc5d6624
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/game/object_list_processor.c
View file

@ -271,6 +271,13 @@ void bhv_mario_update(void) {
// set mario state to the current player // set mario state to the current player
gMarioState = &gMarioStates[gCurrentObject->oBehParams - 1]; gMarioState = &gMarioStates[gCurrentObject->oBehParams - 1];
// sanity check torsoPos, it isn't updated off-screen otherwise
Vec3f torsoDiff = { 0 };
vec3f_dif(torsoDiff, gMarioState->pos, gMarioState->marioBodyState->torsoPos);
if (vec3f_length(torsoDiff) > 300) {
vec3f_copy(gMarioState->marioBodyState->torsoPos, gMarioState->pos);
}
u32 particleFlags = 0; u32 particleFlags = 0;
s32 i; s32 i;