Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly offset player spawns

This commit is contained in:
MysterD 2020-09-10 22:18:10 -07:00
parent 7025183317
commit f987521a40
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/game/mario.c
View File

@ -2027,13 +2027,14 @@ static void init_single_mario(struct MarioState* m) {
// two-player hack
u8 isLocal = (m->playerIndex == 0);
f32 spawnAngle = m->faceAngle[1] + 0x4000;
if ((gNetworkType == NT_CLIENT && isLocal) || (gNetworkType == NT_SERVER && !isLocal)) {
m->pos[0] += 50.0f * coss(m->faceAngle[1]);
m->pos[2] += 50.0f * sins(m->faceAngle[1]);
m->pos[0] += 60.0f * sins(spawnAngle);
m->pos[2] += 60.0f * coss(spawnAngle);
}
else {
m->pos[0] -= 50.0f * coss(m->faceAngle[1]);
m->pos[2] -= 50.0f * sins(m->faceAngle[1]);
m->pos[0] -= 60.0f * sins(spawnAngle);
m->pos[2] -= 60.0f * coss(spawnAngle);
}
m->floorHeight = find_floor(m->pos[0], m->pos[1], m->pos[2], &m->floor);