aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozanLeClerc <bousset.rudy@gmail.com>2020-01-28 16:37:12 +0100
committerJozanLeClerc <bousset.rudy@gmail.com>2020-01-28 16:37:12 +0100
commit178eca9d786caa5249a29de5218638da9bf224c9 (patch)
tree9318c9c5c237fa2091930799b3d909a1ea421164
parentGot sprite (diff)
download42-cub3d-178eca9d786caa5249a29de5218638da9bf224c9.tar.gz
42-cub3d-178eca9d786caa5249a29de5218638da9bf224c9.tar.bz2
42-cub3d-178eca9d786caa5249a29de5218638da9bf224c9.tar.xz
42-cub3d-178eca9d786caa5249a29de5218638da9bf224c9.tar.zst
42-cub3d-178eca9d786caa5249a29de5218638da9bf224c9.zip
Good for now, I'll continue later
-rw-r--r--map/map_one.cub23
-rw-r--r--src/ft_get_colors.c4
-rw-r--r--src/ft_get_sprite.c1
-rw-r--r--src/ft_select_get.c4
4 files changed, 6 insertions, 26 deletions
diff --git a/map/map_one.cub b/map/map_one.cub
index 1d6ceed..388dd3a 100644
--- a/map/map_one.cub
+++ b/map/map_one.cub
@@ -1,30 +1,9 @@
-
-
-
R 1400 900
-
-
-
NO ./path_to_the_north_texture
-
-
-
-
-
-
SO ./path_to_the_south_texture
-WE ./path_to_the_west_texture
EA ./path_to_the_east_texture
-
-
-
-
-
-
-
-
-
+WE ./path_to_the_west_texture
S ./path_to_the_sprite_texture
F 220,100,0
C 225,30,0
diff --git a/src/ft_get_colors.c b/src/ft_get_colors.c
index 750ebed..1b67447 100644
--- a/src/ft_get_colors.c
+++ b/src/ft_get_colors.c
@@ -15,7 +15,7 @@ ft_check_digits(const char *word)
return (0);
}
-static int
+int
ft_get_f_color(char *line, char **words, t_cub *clist)
{
char **num;
@@ -42,7 +42,7 @@ ft_get_f_color(char *line, char **words, t_cub *clist)
return (0);
}
-static int
+int
ft_get_c_color(char *line, char **words, t_cub *clist)
{
char **num;
diff --git a/src/ft_get_sprite.c b/src/ft_get_sprite.c
index f1fa73f..b412442 100644
--- a/src/ft_get_sprite.c
+++ b/src/ft_get_sprite.c
@@ -9,6 +9,5 @@ ft_get_sprite(char **words, t_cub *clist)
ft_memdel(clist->sprite_path);
if (!(clist->sprite_path = ft_strdup(*(words + 1))))
return (-1);
- ft_printf("{%s}\n", clist->sprite_path);
return (0);
}
diff --git a/src/ft_select_get.c b/src/ft_select_get.c
index d44fa88..eb68711 100644
--- a/src/ft_select_get.c
+++ b/src/ft_select_get.c
@@ -17,6 +17,8 @@ ft_get_id(char **words)
return (4);
if (!ft_strncmp(words[0], "S", 1))
return (5);
+ /* if (!ft_strncmp(words[0], "F", 1)) */
+ /* return (6); */
return (12);
}
@@ -32,7 +34,7 @@ ft_select_get(char **words, t_cub *clist)
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_colors;
+ /* fun_ptr[6] = ft_get_f_color; */
if ((id = ft_get_id(words)) == 12)
{
ft_free_words(words);