aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ft_init_lists.c10
-rw-r--r--src/ft_init_sprites.c35
2 files changed, 37 insertions, 8 deletions
diff --git a/src/ft_init_lists.c b/src/ft_init_lists.c
index 3e4dc96..fa862ae 100644
--- a/src/ft_init_lists.c
+++ b/src/ft_init_lists.c
@@ -11,7 +11,6 @@
/* ************************************************************************** */
#include <libft.h>
-#include <mlx.h>
#include <cub3d.h>
#include <stddef.h>
#include <stdlib.h>
@@ -85,22 +84,17 @@ static int8_t
cl->walltexgood = 0;
ft_init_funptr(cl);
ft_init_ref(cl);
+ if (!(cl->sprites = ft_init_sprites()))
+ return (-1);
return (0);
}
int8_t
ft_init_cub3d(t_cub *clist)
{
- uint8_t i;
if (ft_init_cub(clist) < 0)
return (-1);
if (ft_init_win(&clist->wlist) < 0)
return (-1);
- i = 0;
- while (i < 9)
- {
- ft_bzero(clist->sprites[i], 4096);
- i++;
- }
return (0);
}
diff --git a/src/ft_init_sprites.c b/src/ft_init_sprites.c
new file mode 100644
index 0000000..4fa21bf
--- /dev/null
+++ b/src/ft_init_sprites.c
@@ -0,0 +1,35 @@
+/* ************************************************************************** */
+/* */
+/* ::: :::::::: */
+/* ft_init_lists.c :+: :+: :+: */
+/* +:+ +:+ +:+ */
+/* By: rbousset <marvin@42.fr> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* Created: 2020/02/14 17:28:53 by rbousset #+# #+# */
+/* Updated: 2020/02/14 17:28:53 by rbousset ### ########lyon.fr */
+/* */
+/* ************************************************************************** */
+
+#include <libft.h>
+#include <cub3d.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+t_sprite
+ **ft_init_sprites(void)
+{
+ t_sprite **sprites;
+ uint8_t i;
+
+ if (!(sprites = (t_sprite**)ft_calloc(8, sizeof(t_sprite*))))
+ return (NULL);
+ i = 0;
+ while (i < 9)
+ {
+ if (!(sprites[i] = (t_sprite*)ft_calloc(4096, sizeof(t_sprite))))
+ return (NULL);
+ i++;
+ }
+ return (sprites);
+}