diff options
| author | Dominik Kaiser | 2024-05-15 12:36:00 +0200 |
|---|---|---|
| committer | GitHub | 2024-05-15 12:36:00 +0200 |
| commit | 012afb95fd1cb5c7e625b4b023c98573c0e0499f (patch) | |
| tree | e76d37b1d416f0405a7267a38d184eca32ad1bd8 /src/loop.c | |
| parent | 7b021c4426f21bf20fed61459ddedb5224e25bc4 (diff) | |
| parent | ed5342399d02ba5d1032a2ef99afdc1c875ed4d8 (diff) | |
| download | so_long-012afb95fd1cb5c7e625b4b023c98573c0e0499f.tar.gz so_long-012afb95fd1cb5c7e625b4b023c98573c0e0499f.zip | |
Merge collision into master
Collision
Diffstat (limited to 'src/loop.c')
| -rw-r--r-- | src/loop.c | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -6,11 +6,10 @@ /* By: dkaiser <dkaiser@student.42heilbronn.de +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/09 15:09:24 by dkaiser #+# #+# */ -/* Updated: 2024/05/10 13:18:51 by dkaiser ### ########.fr */ +/* Updated: 2024/05/14 12:45:26 by dkaiser ### ########.fr */ /* */ /* ************************************************************************** */ -#include "libft.h" #include "so_long.h" void loop(void *params) @@ -18,13 +17,6 @@ void loop(void *params) t_game *game; game = (t_game *)params; - game->player.direction.x = ((game->input_direction & RIGHT) != 0) - - ((game->input_direction & LEFT) != 0); - game->player.direction.y = ((game->input_direction & DOWN) != 0) - - ((game->input_direction & UP) != 0); - game->player.position.x += game->player.direction.x * PLAYER_MOVE_SPEED - * game->mlx->delta_time; - game->player.position.y += game->player.direction.y * PLAYER_MOVE_SPEED - * game->mlx->delta_time; + player_process(game); draw(game); } |