diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-02 00:33:11 +0100 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-02 00:33:11 +0100 |
| commit | fc61b9019c867c88868da308fd2d0bfce7408c7f (patch) | |
| tree | 31ca264c2f2cc61613d38a0ffa91e1894e691f53 /src | |
| parent | Another song (diff) | |
| download | 42-cub3d-fc61b9019c867c88868da308fd2d0bfce7408c7f.tar.gz 42-cub3d-fc61b9019c867c88868da308fd2d0bfce7408c7f.tar.bz2 42-cub3d-fc61b9019c867c88868da308fd2d0bfce7408c7f.tar.xz 42-cub3d-fc61b9019c867c88868da308fd2d0bfce7408c7f.tar.zst 42-cub3d-fc61b9019c867c88868da308fd2d0bfce7408c7f.zip | |
in progress
Diffstat (limited to 'src')
| -rw-r--r-- | src/ft_get_music.c | 5 | ||||
| -rw-r--r-- | src/ft_init_funptr.c | 25 | ||||
| -rw-r--r-- | src/ft_select_get.c | 26 |
3 files changed, 31 insertions, 25 deletions
diff --git a/src/ft_get_music.c b/src/ft_get_music.c index c9119c9..0b6fede 100644 --- a/src/ft_get_music.c +++ b/src/ft_get_music.c @@ -10,6 +10,10 @@ /* */ /* ************************************************************************** */ +#include <libft.h> +#include <cub3d.h> +#include <stdint.h> + int8_t ft_get_music(char **words, t_cub *clist) { @@ -18,6 +22,7 @@ int8_t ft_sprintf(clist->errmsg, FT_ERR_ARGS); return (-1); } + ft_printf("%s", *(words + 1)); if (ft_check_ext(*(words + 1), ".wav") < 0) { ft_sprintf(clist->errmsg, FT_ERR_NOT_A_WAV); diff --git a/src/ft_init_funptr.c b/src/ft_init_funptr.c index 7721381..1988cb0 100644 --- a/src/ft_init_funptr.c +++ b/src/ft_init_funptr.c @@ -10,7 +10,8 @@ /* */ /* ************************************************************************** */ -#include <cub3.d> +#include <cub3d.h> + void ft_init_funptr(t_cub *clist) { @@ -20,15 +21,15 @@ void clist->key_ptr[3] = ft_d_key; clist->key_ptr[4] = ft_left_key; clist->key_ptr[5] = ft_right_key; - fun_ptr[0] = ft_get_res; - fun_ptr[1] = ft_get_tex_no; - fun_ptr[2] = ft_get_tex_so; - fun_ptr[3] = ft_get_tex_ea; - fun_ptr[4] = ft_get_tex_we; - fun_ptr[5] = ft_get_sprite; - fun_ptr[6] = ft_get_f_color; - fun_ptr[7] = ft_get_c_color; - fun_ptr[8] = ft_get_path_nl; - fun_ptr[9] = ft_get_tex_nl; - fun_ptr[10] = ft_get_music; + clist->get_ptr[0] = ft_get_res; + clist->get_ptr[1] = ft_get_tex_no; + clist->get_ptr[2] = ft_get_tex_so; + clist->get_ptr[3] = ft_get_tex_ea; + clist->get_ptr[4] = ft_get_tex_we; + clist->get_ptr[5] = ft_get_sprite; + clist->get_ptr[6] = ft_get_f_color; + clist->get_ptr[7] = ft_get_c_color; + clist->get_ptr[8] = ft_get_path_nl; + clist->get_ptr[9] = ft_get_tex_nl; + clist->get_ptr[10] = ft_get_music; } diff --git a/src/ft_select_get.c b/src/ft_select_get.c index 9d97748..ed569ff 100644 --- a/src/ft_select_get.c +++ b/src/ft_select_get.c @@ -62,18 +62,18 @@ static int8_t int8_t ret; char ref[12][3]; - ft_memcpy(ref[0], "R\0", 3); - ft_memcpy(ref[1], "NO", 3); - ft_memcpy(ref[2], "SO", 3); - ft_memcpy(ref[3], "EA", 3); - ft_memcpy(ref[4], "WE", 3); - ft_memcpy(ref[5], "S\0", 3); - ft_memcpy(ref[6], "F\0", 3); - ft_memcpy(ref[7], "C\0", 3); - ft_memcpy(ref[8], "L\0", 3); - ft_memcpy(ref[9], "LT", 3); - ft_memcpy(ref[9], "MU", 3); - ft_memcpy(ref[11], "", 1); + ft_sprintf(ref[0], "R"); + ft_sprintf(ref[1], "NO"); + ft_sprintf(ref[2], "SO"); + ft_sprintf(ref[3], "EA"); + ft_sprintf(ref[4], "WE"); + ft_sprintf(ref[5], "S"); + ft_sprintf(ref[6], "F"); + ft_sprintf(ref[7], "C"); + ft_sprintf(ref[8], "L"); + ft_sprintf(ref[9], "LT"); + ft_sprintf(ref[10], "MU"); + ft_sprintf(ref[11], ""); ret = 0; while (ft_strncmp(words[0], ref[ret], 3) && ref[ret][0]) ret++; @@ -94,7 +94,7 @@ int8_t ft_free_words(words); return (12); } - if (id < 0 || (*fun_ptr[id])(words, clist) < 0) + if (id < 0 || clist->get_ptr[id](words, clist) < 0) { ft_free_words(words); return ((id < 0) ? (-2) : (-1)); |