falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

port: fix #23 

credit to Ryan for figuring this out
This commit is contained in:
fgsfds 2023-08-19 15:45:16 +02:00
parent e6a4b9f2fe
commit 8232d4a3f2
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/chraction.c
View File

@ -15014,12 +15014,21 @@ bool chrAdjustPosForSpawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32
}
}
#ifdef PLATFORM_N64
// Try 60cm in 8 directions
for (i = 0; i < 8; i++) {
testpos.x = pos->x + sinf(curangle) * 60;
testpos.y = pos->y;
testpos.z = pos->z + cosf(curangle) * 60;
#else
// On Defection some floating point precision issues result in P2 being placed in the way of P1's cutscene animation,
// which makes P1 start stuck in P2 in coop, so the distance is increased to 80 to avoid that
const f32 distance = (g_Vars.stagenum == STAGE_DEFECTION) ? 80.f : 60.f;
for (i = 0; i < 8; i++) {
testpos.x = pos->x + sinf(curangle) * distance;
testpos.y = pos->y;
testpos.z = pos->z + cosf(curangle) * distance;
#endif
if ((onlysurrounding && cdTestCylMove04(pos, rooms, &testpos, testrooms, CDTYPE_ALL & ~CDTYPE_PLAYERS, 1, ymax, -200) != CDRESULT_COLLISION)
|| (!onlysurrounding && cdTestLos11(pos, rooms, &testpos, testrooms, CDTYPE_BG))) {
chr0f021fa8(NULL, &testpos, testrooms);