sadpmpk
/
HATPC
1
0
Fork 0
Code Issues 11 Pull Requests Projects 4 Releases Wiki Activity

Fix jumping issue when exitting water 

Changelog:
- Jump is not recovered when exiting water on ground. Fix by doing a
  ground check to recover a jump when exiting water
- Disable crouching when not on ground
- Slightly refactor crouch handling
scene_man
En Yi 2023-02-01 21:02:43 +08:00
parent e2ae30e45e
commit dc24f17925
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engine/game_systems.c
View File

@ -178,6 +178,7 @@ void player_movement_input_system(Scene_t* scene)
//else
{
if (!(p_mstate->ground_state & 1)) p_pstate->is_crouch &= 0b01;
if (p_pstate->is_crouch == 0b01)
{
Vector2 test_pos = p_ctransform->position;
@ -185,15 +186,13 @@ void player_movement_input_system(Scene_t* scene)
Vector2 top = {0, 0};
test_pos.x += PLAYER_C_XOFFSET;
test_pos.y -= PLAYER_C_YOFFSET;
if (!check_collision_at(test_pos, test_bbox, &tilemap, top))
if (check_collision_at(test_pos, test_bbox, &tilemap, top))
{
p_pstate->is_crouch >>= 1;
p_pstate->is_crouch |= 0b10;
}
}
else
{
p_pstate->is_crouch >>= 1;
}
p_pstate->is_crouch >>= 1;
if (p_cjump->cooldown_timer > 0) p_cjump->cooldown_timer--;
// Jumps is possible as long as you have a jump
@ -631,6 +630,10 @@ void player_ground_air_transition_system(Scene_t* scene)
else if (p_mstate->water_state == 0b10 || p_mstate->ground_state == 0b10)
{
p_cjump->jumps -= (p_cjump->jumps > 0)? 1:0;
if (p_mstate->ground_state & 1)
{
p_cjump->jumps++;
}
}
}
}