Tons of changes

1 files changed, 27 insertions, 24 deletions

diff --git a/inc/cub3d.h b/inc/cub3d.h
index 4f495d4..80f89bb 100644
--- a/inc/cub3d.h
+++ b/inc/cub3d.h
@@ -19,33 +19,36 @@
 #define FT_ESC_KEY 53
 #endif
 
-typedef struct	s_win
+typedef struct		s_cub
 {
-	void		*wlx;
-	void		*winptr;
-	int			x_size;
-	int			y_size;
-}				t_win;
+	char			*no_tex_path;
+	char			*so_tex_path;
+	char			*ea_tex_path;
+	char			*we_tex_path;
+	char			*sprite_path;
+	int				f_color;
+	int				c_color;
+}					t_cub;
 
-typedef struct	s_cub
+typedef struct		s_win
 {
-	char		*north_path;
-	char		*south_path;
-	char		*west_path;
-	char		*east_path;
-	char		*sprite_path;
-	int			f_color;
-	int			c_color;
-}				t_cub;
+	void			*wlx;
+	void			*winptr;
+	int				x_size;
+	int				y_size;
+	struct s_cub	*clist;
+}					t_win;
 
-t_cub			*ft_init_cub(void);
-t_win			*ft_init_win(void);
-void			ft_parse_map(t_win *wlist, t_cub *clist, const char *map_path);
-int				ft_key_event(int keycode, void *param);
-int				ft_exit(uint8_t exit_code);
-void			ft_drawsquare(t_win *wlist, t_cub *clist, int a, int b);
-int				ft_get_res(int fd, t_win *wlist);
-int				ft_map_error(unsigned int line);
-int				ft_init_winlx(t_win *wlist);
+t_win				*ft_init_win(void);
+t_cub				*ft_init_cub(void);
+void				ft_parse_map(t_win *wlist, const char *map_path);
+int					ft_key_event(int keycode, void *param);
+int					ft_exit(uint8_t exit_code, t_win *wlist);
+void				ft_drawsquare(t_win *wlist, int a, int b);
+int					ft_get_res(int fd, t_win *wlist);
+int					ft_get_tex(int fd, t_win *wlist);
+void				ft_free_words(char **words);
+int					ft_map_error(unsigned int line, t_win *wlist);
+int					ft_init_winlx(t_win *wlist);
 
 #endif