Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed spawn offset when you're the only player there (speedrunners)

This commit is contained in:
MysterD 2022-03-11 21:43:54 -08:00
parent 8b377289a5
commit 929bf2322e
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/game/mario.c
View File

@ -2129,8 +2129,24 @@ static void init_single_mario(struct MarioState* m) {
u16 spawnAngle = m->faceAngle[1] + 0x4000 + 0x10000 * ((f32)globalIndex / ((f32)connectedPlayers + 1)); u16 spawnAngle = m->faceAngle[1] + 0x4000 + 0x10000 * ((f32)globalIndex / ((f32)connectedPlayers + 1));
f32 spawnMag = 60.0f * ((connectedPlayers + 1) / 2.0f); f32 spawnMag = 60.0f * ((connectedPlayers + 1) / 2.0f);
if (spawnMag > 120) { spawnMag = 120; } if (spawnMag > 120) { spawnMag = 120; }
// figure out if we should apply offset
u8 nearbyPlayers = 1;
for (int i = 1; i < MAX_PLAYERS; i++) {
struct NetworkPlayer* np = &gNetworkPlayers[i];
if (!np->connected) { continue; }
if (np->currCourseNum == gCurrCourseNum && np->currLevelNum == gCurrLevelNum && np->currActNum == gCurrActStarNum && np->currAreaIndex == gCurrAreaIndex) {
nearbyPlayers++;
}
}
if (nearbyPlayers > 1) {
m->pos[0] -= spawnMag * sins(spawnAngle); m->pos[0] -= spawnMag * sins(spawnAngle);
m->pos[2] -= spawnMag * coss(spawnAngle); m->pos[2] -= spawnMag * coss(spawnAngle);
LOG_INFO("spawn offset!, %u", nearbyPlayers);
} else {
LOG_INFO("no spawn offset!, %u", nearbyPlayers);
}
m->floorHeight = find_floor(m->pos[0], m->pos[1], m->pos[2], &m->floor); m->floorHeight = find_floor(m->pos[0], m->pos[1], m->pos[2], &m->floor);