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

Prevent extra death for bubbled player on area change

This commit is contained in:
MysterD 2020-09-08 13:53:46 -07:00
parent c9db255ac6
commit 9bbacb90f7
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/game/level_update.c
View File

@ -382,25 +382,28 @@ void init_mario_after_warp(void) {
// set to a minimum of two lives on level change // set to a minimum of two lives on level change
if (sWarpDest.type == WARP_TYPE_CHANGE_LEVEL) { if (sWarpDest.type == WARP_TYPE_CHANGE_LEVEL) {
gMarioStates[i].numLives = max(gMarioStates[i].numLives, 2); gMarioStates[i].numLives = max(gMarioStates[i].numLives, 2);
gMarioStates[i].health = 0x880;
gMarioStates[i].healCounter = 0;
gMarioStates[i].hurtCounter = 0;
} }
if (sWarpDest.type == WARP_TYPE_CHANGE_LEVEL || sWarpDest.type == WARP_TYPE_CHANGE_AREA) { if (sWarpDest.type == WARP_TYPE_CHANGE_LEVEL || sWarpDest.type == WARP_TYPE_CHANGE_AREA) {
gPlayerSpawnInfos[i].areaIndex = sWarpDest.areaIdx; gPlayerSpawnInfos[i].areaIndex = sWarpDest.areaIdx;
// reset health
gMarioStates[i].health = 0x880;
gMarioStates[i].healCounter = 0;
gMarioStates[i].hurtCounter = 0;
if (i == 0) { load_mario_area(); } if (i == 0) { load_mario_area(); }
} }
// enforce bubble on area change
if (i == 0 && gMarioStates[i].numLives == -1) {
mario_set_bubbled(&gMarioStates[i]);
gMarioStates[i].health = 0xFF;
}
} }
init_mario(); init_mario();
set_mario_initial_action(gMarioState, marioSpawnType, sWarpDest.arg); set_mario_initial_action(gMarioState, marioSpawnType, sWarpDest.arg);
// enforce bubble on area change
if (gMarioState->playerIndex == 0 && gMarioState->numLives == -1) {
mario_set_bubbled(gMarioState);
}
gMarioState->interactObj = spawnNode->object; gMarioState->interactObj = spawnNode->object;
gMarioState->usedObj = spawnNode->object; gMarioState->usedObj = spawnNode->object;
} }