summaryrefslogtreecommitdiff
path: root/src/init.c
diff options
context:
space:
mode:
authorDominik Kaiser2024-05-15 12:16:05 +0200
committerDominik Kaiser2024-05-15 12:16:05 +0200
commited5342399d02ba5d1032a2ef99afdc1c875ed4d8 (patch)
treee76d37b1d416f0405a7267a38d184eca32ad1bd8 /src/init.c
parent5a7e68ce0331077594dc2d85c81fc087d80734c7 (diff)
downloadso_long-ed5342399d02ba5d1032a2ef99afdc1c875ed4d8.tar.gz
so_long-ed5342399d02ba5d1032a2ef99afdc1c875ed4d8.zip
Change collision checking and add player.size
Collision checking will now be done using the move_and_slide function. Instead of tile_size, now player.size will be used for checking collisions.
Diffstat (limited to 'src/init.c')
-rw-r--r--src/init.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/init.c b/src/init.c
index 5277b5c..9959da6 100644
--- a/src/init.c
+++ b/src/init.c
@@ -6,7 +6,7 @@
/* By: dkaiser <dkaiser@student.42heilbronn.de +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/09 14:50:09 by dkaiser #+# #+# */
-/* Updated: 2024/05/11 16:23:54 by dkaiser ### ########.fr */
+/* Updated: 2024/05/15 12:13:03 by dkaiser ### ########.fr */
/* */
/* ************************************************************************** */
@@ -40,12 +40,14 @@ static void init_player(t_game *game)
player = &game->player;
texture = mlx_load_png("textures/player.png");
- player->position.x = game->map.player_start_tile.x * 48;
- player->position.y = game->map.player_start_tile.y * 48;
+ player->position.x = game->map.player_start_tile.x * game->map.grid_size.x;
+ player->position.y = game->map.player_start_tile.y * game->map.grid_size.y;
player->velocity.x = 0;
player->velocity.y = 0;
+ player->size.x = 44;
+ player->size.y = 44;
player->img = mlx_texture_to_image(game->mlx, texture);
- mlx_resize_image(player->img, 48, 48);
+ mlx_resize_image(player->img, player->size.x, player->size.y);
mlx_image_to_window(game->mlx, player->img, player->position.x,
player->position.y);
}