Skip to content

Commit 9d4af9c

Browse files
committed
Fix climb and slide animations being always 'carry'
1 parent 21671d9 commit 9d4af9c

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/player.zig

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -896,9 +896,7 @@ fn ACTION_PRG(level: *lvl.Level, action: PlayerAction) void {
896896
globals.LAST_ORDER = action;
897897
player_friction(player);
898898
if (@abs(player.*.sprite.speed_x) >= 1 * 16 and player.sprite.flipped == (player.*.sprite.speed_x < 0)) {
899-
var slide:PlayerAction = .Slide;
900-
slide.addCarry();
901-
player.sprite.animation = data.get_anim_player(slide);
899+
player.sprite.animation = data.get_anim_player(if (globals.CARRY_FLAG) .Slide_Carry else .Slide);
902900
} else {
903901
player.sprite.animation = data.get_anim_player(action);
904902
}
@@ -961,9 +959,7 @@ fn ACTION_PRG(level: *lvl.Level, action: PlayerAction) void {
961959
}
962960
}
963961
if (player.y_axis != 0) {
964-
var climb :PlayerAction = .Climb;
965-
climb.addCarry();
966-
NEW_FORM(player, climb);
962+
NEW_FORM(player, if (globals.CARRY_FLAG) .Climb_Carry else .Climb);
967963
GET_IMAGE(level);
968964
player.sprite.x = @as(i16, @bitCast(@as(u16, @bitCast(player.*.sprite.x)) & 0xFFF0)) + 8;
969965
tileX = player.sprite.x >> 4;

0 commit comments

Comments
 (0)