From 459016417094600407756ebe7d387cdc5e4ca6d2 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Sun, 1 Mar 2020 22:54:56 +0100 Subject: Norme --- src/main.c | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 3585626..74c9b45 100644 --- a/src/main.c +++ b/src/main.c @@ -13,42 +13,21 @@ #include #include #include -#include -#include int main(int argc, const char *argv[]) { t_cub *clist; - if (argc < 2) - { - ft_dprintf(STDERR_FILENO, "Error\n\033[1;31mNo map selected\n\033[0m"); + if (ft_check_map_arg(argc, argv) == FT_RET_BAD_ARGV) return (FT_RET_BAD_ARGV); - } if (ft_init_cub3d(&clist) < 0) return (FT_RET_FAILED_STRUCTS); ft_parse_map(argv[1], clist); if (ft_init_winlx(clist) < 0) return (ft_exit(FT_RET_FAILED_MLX, clist)); ft_wall_tex_init(clist); - if (argc < 3) - { - if (ft_init_winptr(clist) < 0) - return (ft_exit(FT_RET_FAILED_MLX, clist)); - ft_draw_scene(clist); - ft_hooks_and_loops(clist->wlist, clist); - } - else if (argc == 3 && !ft_strncmp("--save", argv[2], 7)) - { - ft_draw_scene_bmp(clist); - return (ft_exit(FT_RET_FINE, clist)); - } - else - { - ft_dprintf(STDERR_FILENO, "Error\n\033[1;31mBad arguments\n\033[0m"); - return (ft_exit(FT_RET_BAD_ARGV, clist)); - } - /* ft_music(clist); */ - return (0); + if (ft_use_args(argc, argv, clist) == FT_RET_FINE) + return (FT_RET_FINE); + return (FT_RET_FINE); } -- cgit v1.2.3