etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-26 14:03:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only remove the offset when it\'s not a door warp (#164)

Browse source
This commit is contained in:
wRadion 2022-08-26 02:37:30 +02:00 committed by GitHub
parent 101d6f6e8d
commit 0cbcdf508b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/level_update.c
View file

@ -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;
@ -1449,7 +1449,7 @@ void update_menu_level(void) {
} else { } else {
reset_volume(); reset_volume();
disable_background_sound(); disable_background_sound();
if (get_current_background_music() == 0x0021) { if (get_current_background_music() == 0x0021) {
if (curLevel == LEVEL_JRB) { if (curLevel == LEVEL_JRB) {
dynos_warp_to_level(curLevel, 1, 2); dynos_warp_to_level(curLevel, 1, 2);
@ -1470,7 +1470,7 @@ s32 update_level(void) {
} else { } else {
sFirstCastleGroundsMenu = false; sFirstCastleGroundsMenu = false;
} }
s32 changeLevel = 0; s32 changeLevel = 0;
if (gChangeLevel != -1) { if (gChangeLevel != -1) {