summaryrefslogtreecommitdiff
path: root/include/so_long.h
diff options
context:
space:
mode:
authorDominik Kaiser2024-05-14 15:13:26 +0200
committerDominik Kaiser2024-05-14 15:13:26 +0200
commit5a7e68ce0331077594dc2d85c81fc087d80734c7 (patch)
tree3883a11b20f6809bd28f2f12e36b638e900fd15a /include/so_long.h
parent11c24e171b4dca0b751fc3f43b4d72121106599e (diff)
downloadso_long-5a7e68ce0331077594dc2d85c81fc087d80734c7.tar.gz
so_long-5a7e68ce0331077594dc2d85c81fc087d80734c7.zip
Implement (somewhat) functional collision
Diffstat (limited to 'include/so_long.h')
-rw-r--r--include/so_long.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/so_long.h b/include/so_long.h
index 6834620..cddfa9e 100644
--- a/include/so_long.h
+++ b/include/so_long.h
@@ -6,7 +6,7 @@
/* By: dkaiser <dkaiser@student.42heilbronn.de +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/08 14:14:02 by dkaiser #+# #+# */
-/* Updated: 2024/05/14 13:52:05 by dkaiser ### ########.fr */
+/* Updated: 2024/05/14 14:43:41 by dkaiser ### ########.fr */
/* */
/* ************************************************************************** */
@@ -86,7 +86,10 @@ int draw_map(t_game *game);
void on_key_input(mlx_key_data_t event, void *params);
t_vector grid_to_screen_pos(t_ivector grid_pos, t_ivector tile_size);
t_ivector screen_to_grid_pos(t_vector screen_pos, t_ivector tile_size);
-int check_collision(t_vector a_pos, t_vector a_size, t_vector b_pos,
- t_vector b_size);
+enum e_tile get_tile(t_tilemap *map, int x, int y);
+int check_collision(t_vector a_pos, t_ivector a_size,
+ t_vector b_pos, t_ivector b_size);
+int check_wall_collision(t_vector a_pos, t_ivector a_size,
+ t_tilemap *map);
#endif // SO_LONG_H