mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-29 23:43:01 +00:00
Only remove the offset when it\'s not a door warp (#164)
This commit is contained in:
parent
101d6f6e8d
commit
0cbcdf508b
1 changed files with 3 additions and 3 deletions
|
@ -438,7 +438,7 @@ void init_mario_after_warp(void) {
|
||||||
set_mario_initial_action(gMarioState, marioSpawnType, sWarpDest.arg);
|
set_mario_initial_action(gMarioState, marioSpawnType, sWarpDest.arg);
|
||||||
|
|
||||||
// remove offset from local mario during warps
|
// remove offset from local mario during warps
|
||||||
if (sWarpDest.type == WARP_TYPE_SAME_AREA) {
|
if (sWarpDest.type == WARP_TYPE_SAME_AREA && marioSpawnType != MARIO_SPAWN_DOOR_WARP) {
|
||||||
gMarioState[0].pos[0] = (s16)spawnNode->object->oPosX;
|
gMarioState[0].pos[0] = (s16)spawnNode->object->oPosX;
|
||||||
gMarioState[0].pos[1] = (s16)spawnNode->object->oPosY;
|
gMarioState[0].pos[1] = (s16)spawnNode->object->oPosY;
|
||||||
gMarioState[0].pos[2] = (s16)spawnNode->object->oPosZ;
|
gMarioState[0].pos[2] = (s16)spawnNode->object->oPosZ;
|
||||||
|
|
Loading…
Reference in a new issue