Resolve some norme errors

diff --git a/include/so_long.h b/include/so_long.h
index 585527e58f84cad2dac519cb6fb50148d60fd664..4a3c924dff74887e378db460a9f7f16294ec2d53 100644 (file)
--- 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/15 14:58:14 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/15 15:10:27 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -52,9 +52,9 @@ typedef struct s_ivector
 
 typedef struct s_collider
 {
-       t_vector position;
-       t_ivector size;
-} t_collider;
+       t_vector        position;
+       t_ivector       size;
+}                              t_collider;
 
 typedef struct s_actor
 {
@@ -78,7 +78,7 @@ typedef struct s_game
 {
        mlx_t           *mlx;
        void            *window;
-       t_actor player;
+       t_actor         player;
        int                     input_direction;
        t_tilemap       map;
 }                              t_game;
@@ -95,8 +95,7 @@ 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);
 enum e_tile            get_tile(t_tilemap *map, int x, int y);
 int                            check_collision(t_collider a, t_collider b);
-int                            check_wall_collision(t_collider collider,
-                                       t_tilemap *map);
+int                            check_wall_collision(t_collider collider, t_tilemap *map);
 void                   move_and_slide(t_actor *actor, t_tilemap *map,
                                        double delta_time);
 int                            is_on_floor(t_collider collider, t_tilemap *map);

diff --git a/src/draw.c b/src/draw.c
index b5e5455b9a56a0e218eee2d0412134418aeb4b7d..ab60df4766eadc8371fab5d4828f7bf5d1a6ee50 100644 (file)
--- a/src/draw.c
+++ b/src/draw.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/09 17:58:23 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/05/11 16:00:17 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/15 15:09:38 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,12 +14,12 @@
 #include "libft.h"
 #include "so_long.h"
 
-int draw_map(t_game *game)
+int    draw_map(t_game *game)
 {
-       int x;
-       int y;
-       mlx_texture_t *wall_texture;
-       mlx_image_t *wall_image;
+       int                             x;
+       int                             y;
+       mlx_texture_t   *wall_texture;
+       mlx_image_t             *wall_image;
 
        wall_texture = mlx_load_png("textures/wall.png");
        wall_image = mlx_texture_to_image(game->mlx, wall_texture);
@@ -33,7 +33,8 @@ int draw_map(t_game *game)
                while (y < game->map.grid_size.y)
                {
                        if (game->map.tiles[y * game->map.grid_size.x + x] == WALL)
-                               mlx_image_to_window(game->mlx, wall_image, x * game->map.tile_size.x, y * game->map.tile_size.y);
+                               mlx_image_to_window(game->mlx, wall_image, x
+                                       * game->map.tile_size.x, y * game->map.tile_size.y);
                        y++;
                }
                x++;

diff --git a/src/init.c b/src/init.c
index 99268261985143602d42aa60be93ea9447da379d..e7fedf209d4990f5fd256885d0c65fb378e53d30 100644 (file)
--- 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/15 14:46:09 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/15 15:09:44 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,7 +18,6 @@ static void   init_actor(t_game *game);
 
 int    init(t_game *game)
 {
-
        game->mlx = mlx_init(1920, 1080, "so_long", false);
        // TODO: make size and title dynamic
        game->input_direction = ZERO;
@@ -36,7 +35,7 @@ static void   init_hooks(t_game *game)
 static void    init_actor(t_game *game)
 {
        mlx_texture_t   *texture;
-       t_actor *player;
+       t_actor                 *player;
 
        player = &game->player;
        texture = mlx_load_png("textures/player.png");
@@ -49,5 +48,5 @@ static void   init_actor(t_game *game)
        player->img = mlx_texture_to_image(game->mlx, texture);
        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);
+               player->position.y);
 }

diff --git a/src/map_utils.c b/src/map_utils.c
index 82acaa9920887003a97dfe81d64a1f6bfbc6c693..6d8fbd901b7b10a4963ba997882af3d0d22a5dea 100644 (file)
--- a/src/map_utils.c
+++ b/src/map_utils.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/14 13:19:34 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/05/14 14:44:39 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/15 15:04:31 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,16 +21,16 @@ t_vector    grid_to_screen_pos(t_ivector grid_pos, t_ivector tile_size)
        return (screen_pos);
 }
 
-t_ivector screen_to_grid_pos(t_vector screen_pos, t_ivector tile_size)
+t_ivector      screen_to_grid_pos(t_vector screen_pos, t_ivector tile_size)
 {
-    t_ivector grid_pos;
+       t_ivector       grid_pos;
 
-    grid_pos.x = screen_pos.x / tile_size.x;
-    grid_pos.y = screen_pos.y / tile_size.y;
-    return (grid_pos);
+       grid_pos.x = screen_pos.x / tile_size.x;
+       grid_pos.y = screen_pos.y / tile_size.y;
+       return (grid_pos);
 }
 
-enum e_tile get_tile(t_tilemap *map, int x, int y)
+enum e_tile    get_tile(t_tilemap *map, int x, int y)
 {
-    return map->tiles[y * map->grid_size.x + x];
+       return (map->tiles[y * map->grid_size.x + x]);
 }