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

Add solid entity check to boulder movement 

Changelog:
- Prevent Boulder going into grid movement if there is an entity in
  the movement when pushed
scene_man
En Yi 2023-06-04 14:28:08 +08:00
parent 20ec3f6395
commit 0e94e64a6a
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scenes/game_systems.c
View File

@ -884,15 +884,30 @@ void player_pushing_system(Scene_t* scene)
}; };
if (point_in_AABB(point_to_check, box)) if (point_in_AABB(point_to_check, box))
{ {
p_other_moveable->gridmove = true; Vector2 target_pos = p_other_ct->position;
p_other_moveable->target_pos = p_other_ct->position;
if (p_ctransform->position.x < p_other_ct->position.x) if (p_ctransform->position.x < p_other_ct->position.x)
{ {
p_other_moveable->target_pos.x = p_other_ct->position.x + TILE_SIZE; target_pos.x += TILE_SIZE;
tile_x++;
} }
else else
{ {
p_other_moveable->target_pos.x = p_other_ct->position.x - TILE_SIZE; target_pos.x -= TILE_SIZE;
tile_x--;
}
if (tile_x >= 0 && tile_x < tilemap.width)
{
unsigned int target_tile_idx = tile_y * tilemap.width + tile_x;
if (
tilemap.tiles[target_tile_idx].tile_type == EMPTY_TILE
&& sc_map_size_64(&tilemap.tiles[target_tile_idx].entities_set) == 0
)
{
p_other_moveable->gridmove = true;
p_other_moveable->prev_pos = p_other_ct->position;
p_other_moveable->target_pos = target_pos;
}
} }
} }
} }