From 939fe7bc4ef60edbe24c759dc7362e4c29650751 Mon Sep 17 00:00:00 2001 From: En Yi Date: Thu, 17 Aug 2023 21:10:11 +0800 Subject: [PATCH] Allow boulder pushing when swimming --- scenes/game_systems.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scenes/game_systems.c b/scenes/game_systems.c index a64ea60..4e9b720 100644 --- a/scenes/game_systems.c +++ b/scenes/game_systems.c @@ -1026,7 +1026,10 @@ void player_pushing_system(Scene_t* scene) { CMovementState_t* p_movement = get_component(p_player, CMOVEMENTSTATE_T); CPlayerState_t* p_pstate = get_component(p_player, CPLAYERSTATE_T); - if (!(p_movement->ground_state & 1) || p_pstate->player_dir.x == 0) continue; + if ( + !(p_movement->ground_state & 1 || p_movement->water_state & 1) + || p_pstate->player_dir.x == 0 + ) continue; CTransform_t* p_ctransform = get_component(p_player, CTRANSFORM_COMP_T); CBBox_t* p_bbox = get_component(p_player, CBBOX_COMP_T);