diff options
| author | Dominik Kaiser | 2024-05-15 14:49:40 +0200 |
|---|---|---|
| committer | Dominik Kaiser | 2024-05-15 14:49:40 +0200 |
| commit | 356ccc1b6b834d502d203036feac4800b0ed3361 (patch) | |
| tree | 36de507cc5e12b0086cd1d4ea3c446164fae33d3 /src/collision.c | |
| parent | e6edad24c9fa56538d66067dcff6bde39f746239 (diff) | |
| download | so_long-356ccc1b6b834d502d203036feac4800b0ed3361.tar.gz so_long-356ccc1b6b834d502d203036feac4800b0ed3361.zip | |
Rename t_player to t_actor
Diffstat (limited to 'src/collision.c')
| -rw-r--r-- | src/collision.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/collision.c b/src/collision.c index 5c16130..4458d60 100644 --- a/src/collision.c +++ b/src/collision.c @@ -6,7 +6,7 @@ /* By: dkaiser <dkaiser@student.42heilbronn.de +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/14 11:48:59 by dkaiser #+# #+# */ -/* Updated: 2024/05/15 13:20:29 by dkaiser ### ########.fr */ +/* Updated: 2024/05/15 14:47:26 by dkaiser ### ########.fr */ /* */ /* ************************************************************************** */ @@ -84,24 +84,24 @@ static int check_wall_collision_with_cell(t_vector a_pos, t_ivector a_size, return (0); } -void move_and_slide(t_player *player, t_tilemap *map, double delta_time) +void move_and_slide(t_actor *actor, t_tilemap *map, double delta_time) { t_vector move_pos; - move_pos.x = player->position.x + (player->velocity.x * delta_time); - move_pos.y = player->position.y; + move_pos.x = actor->position.x + (actor->velocity.x * delta_time); + move_pos.y = actor->position.y; - if ((check_wall_collision(move_pos, player->size, map) & (RIGHT | LEFT)) == 0) - player->position.x = move_pos.x; + if ((check_wall_collision(move_pos, actor->size, map) & (RIGHT | LEFT)) == 0) + actor->position.x = move_pos.x; else - player->velocity.x = 0; + actor->velocity.x = 0; - move_pos.x = player->position.x; - move_pos.y = player->position.y + (player->velocity.y * delta_time); - if ((check_wall_collision(move_pos, player->size, map) & (UP | DOWN)) == 0) - player->position.y = move_pos.y; + move_pos.x = actor->position.x; + move_pos.y = actor->position.y + (actor->velocity.y * delta_time); + if ((check_wall_collision(move_pos, actor->size, map) & (UP | DOWN)) == 0) + actor->position.y = move_pos.y; else - player->velocity.y = 0; + actor->velocity.y = 0; } int is_on_floor(t_vector pos, t_ivector size, t_tilemap *map) |