print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix wall sidling with negative speed (#762)

Browse Source
This commit is contained in:
YoshiMilkman
2024-02-02 22:52:10 -05:00
committed by GitHub
parent 3a5a2f14dd
commit 88c2cdb0a0
1 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/game/mario_actions_moving.c
View File

@@ -678,35 +678,34 @@ void push_or_sidle_wall(struct MarioState *m, Vec3f startPos) {
if (m->forwardVel > 6.0f) {
mario_set_forward_vel(m, 6.0f);
}
if (m->forwardVel > 0.0f) {
if (m->wall != NULL) {
wallAngle = m->wallYaw;
dWallAngle = wallAngle - m->faceAngle[1];
}
if (m->wall == NULL || dWallAngle <= -DEGREES(160) || dWallAngle >= DEGREES(160)) {
m->flags |= MARIO_PUSHING;
set_mario_animation(m, MARIO_ANIM_PUSHING);
play_step_sound(m, 6, 18);
} else {
if (dWallAngle < 0) {
set_mario_anim_with_accel(m, MARIO_ANIM_SIDESTEP_RIGHT, animSpeed);
} else {
set_mario_anim_with_accel(m, MARIO_ANIM_SIDESTEP_LEFT, animSpeed);
}
if (m->marioObj->header.gfx.animInfo.animFrame < 20) {
play_sound((SOUND_MOVING_TERRAIN_SLIDE + m->terrainSoundAddend), m->marioObj->header.gfx.cameraToObject);
m->particleFlags |= PARTICLE_DUST;
}
m->actionState = ACT_STATE_PUSH_OR_SIDLE_WALL_SIDLING;
m->actionArg = wallAngle + 0x8000;
m->marioObj->header.gfx.angle[1] = wallAngle + 0x8000;
m->marioObj->header.gfx.angle[2] = find_floor_slope(m, 0x4000);
}
if (m->wall != NULL) {
wallAngle = m->wallYaw;
dWallAngle = wallAngle - m->faceAngle[1];
}
if (m->wall == NULL || dWallAngle <= -DEGREES(160) || dWallAngle >= DEGREES(160)) {
m->flags |= MARIO_PUSHING;
set_mario_animation(m, MARIO_ANIM_PUSHING);
play_step_sound(m, 6, 18);
} else {
if (dWallAngle < 0) {
set_mario_anim_with_accel(m, MARIO_ANIM_SIDESTEP_RIGHT, animSpeed);
} else {
set_mario_anim_with_accel(m, MARIO_ANIM_SIDESTEP_LEFT, animSpeed);
}
if (m->marioObj->header.gfx.animInfo.animFrame < 20) {
play_sound((SOUND_MOVING_TERRAIN_SLIDE + m->terrainSoundAddend), m->marioObj->header.gfx.cameraToObject);
m->particleFlags |= PARTICLE_DUST;
}
m->actionState = ACT_STATE_PUSH_OR_SIDLE_WALL_SIDLING;
m->actionArg = wallAngle + 0x8000;
m->marioObj->header.gfx.angle[1] = wallAngle + 0x8000;
m->marioObj->header.gfx.angle[2] = find_floor_slope(m, 0x4000);
}
}
void tilt_body_walking(struct MarioState *m, s16 startYaw) {