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

Fix jump not decremented in air 

Changelog:
- Remove jumps when transition from ground to air as well
- Use half size at approriate places
scene_man
En Yi 2023-01-03 22:41:54 +08:00
parent 0169a90ee8
commit 3c02068ca6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scene_impl.c
View File

@ -317,7 +317,6 @@ static void player_movement_input_system(Scene_t* scene)
} }
p_cjump->jumped = true; p_cjump->jumped = true;
p_cjump->jumps--;
p_cjump->cooldown_timer = 15; p_cjump->cooldown_timer = 15;
} }
} }
@ -439,8 +438,8 @@ static void movement_update_system(Scene_t* scene)
if (p_ctransform->water_state & 1) if (p_ctransform->water_state & 1)
{ {
unsigned int tile_idx = get_tile_idx( unsigned int tile_idx = get_tile_idx(
p_ctransform->position.x + p_bbox->size.x / 2, p_ctransform->position.x + p_bbox->half_size.x,
p_ctransform->position.y + p_bbox->size.y / 2, p_ctransform->position.y + p_bbox->half_size.y,
data->tilemap.width data->tilemap.width
); );
@ -499,7 +498,7 @@ static void player_ground_air_transition_system(Scene_t* scene)
} }
// TODO: Handle in water <-> out of water transition // TODO: Handle in water <-> out of water transition
if (p_ctransform->water_state == 0b10) if (p_ctransform->water_state == 0b10 || p_ctransform->ground_state == 0b10)
{ {
p_cjump->jumps -= (p_cjump->jumps > 0)? 1:0; p_cjump->jumps -= (p_cjump->jumps > 0)? 1:0;
} }
@ -632,8 +631,8 @@ static void state_transition_update_system(Scene_t *scene)
if (!(p_ctransform->water_state & 1)) if (!(p_ctransform->water_state & 1))
{ {
unsigned int tile_idx = get_tile_idx( unsigned int tile_idx = get_tile_idx(
p_ctransform->position.x + p_bbox->size.x / 2, p_ctransform->position.x + p_bbox->half_size.x,
p_ctransform->position.y + p_bbox->size.y / 2, p_ctransform->position.y + p_bbox->half_size.y,
data->tilemap.width data->tilemap.width
); );