diff options
Diffstat (limited to '')
| -rw-r--r-- | inc/cub3d.h | 37 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 18 | 
2 files changed, 35 insertions, 20 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index 60c9bb1..699dc6a 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -1,14 +1,13 @@  /* ************************************************************************** */ -/*                                                          LE - /            */ -/*                                                              /             */ -/*   cub3d.h                                          .::    .:/ .      .::   */ -/*                                                 +:+:+   +:    +:  +:+:+    */ -/*   By: rbousset <marvin@le-101.fr>                +:+   +:    +:    +:+     */ -/*                                                 #+#   #+    #+    #+#      */ -/*   Created: 2020/02/02 17:19:43 by rbousset     #+#   ##    ##    #+#       */ -/*   Updated: 2020/02/02 17:19:43 by rbousset    ###    #+. /#+    ###.fr     */ -/*                                                         /                  */ -/*                                                        /                   */ +/*                                                                            */ +/*                                                        :::      ::::::::   */ +/*   cub3d.h                                            :+:      :+:    :+:   */ +/*                                                    +:+ +:+         +:+     */ +/*   By: rbousset <marvin@42.fr>                    +#+  +:+       +#+        */ +/*                                                +#+#+#+#+#+   +#+           */ +/*   Created: 2020/02/14 17:20:11 by rbousset          #+#    #+#             */ +/*   Updated: 2020/02/14 17:20:12 by rbousset         ###   ########lyon.fr   */ +/*                                                                            */  /* ************************************************************************** */  #	ifndef CUB3D_H @@ -46,7 +45,6 @@  #	define FT_SCR_SIZE "1920x1080"  #	endif -  /*  ** ret vals:  ** 1: no argv[1] @@ -83,19 +81,24 @@ int					ft_check_missing(t_cub *clist);  int8_t				ft_check_map_line(char *line, uint8_t l, t_cub *clist);  size_t				ft_get_line_len(char *line);  int					ft_missing_error(const char *err, t_cub *clist); -uint8_t				ft_free_words(char **words); int					ft_map_error(t_cub *clist); +uint8_t				ft_free_words(char **words); +int					ft_map_error(t_cub *clist);  int					ft_init_winlx(t_cub *clist);  void				ft_draw_scene(t_cub *clist);  void				ft_print_list(t_cub *clist);  uint32_t			ft_rgb_to_hex(t_rgb rgb);  t_ray				ft_init_s_ray(void);  void				ft_detect(t_cub *cl); -int8_t				ft_draw_verline(t_cub *cl, int32_t x, int32_t y1, -									int32_t y2, int32_t color); +int8_t				ft_draw_verline(t_cub *cl, int32_t x, +									int32_t y1, int32_t y2);  void				ft_castray(t_cub *cl);  void				ft_draw_map(char **map, t_cub *clist); -int8_t				ft_f1_key(t_cub *clist); -int8_t				ft_left_key(t_cub *clist); -int8_t				ft_right_key(t_cub *clist); +int					ft_w_key(t_cub *clist); +int					ft_a_key(t_cub *clist); +int					ft_s_key(t_cub *clist); +int					ft_d_key(t_cub *clist); +int					ft_f1_key(t_cub *clist); +int					ft_left_key(t_cub *clist); +int					ft_right_key(t_cub *clist);  #	endif diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 08fc814..eab9b7e 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -1,5 +1,17 @@ -#ifndef CUB3D_STRUCTS_H -#define CUB3D_STRUCTS_H +/* ************************************************************************** */ +/*                                                                            */ +/*                                                        :::      ::::::::   */ +/*   cub3d_structs.h                                    :+:      :+:    :+:   */ +/*                                                    +:+ +:+         +:+     */ +/*   By: rbousset <marvin@42.fr>                    +#+  +:+       +#+        */ +/*                                                +#+#+#+#+#+   +#+           */ +/*   Created: 2020/02/14 17:20:05 by rbousset          #+#    #+#             */ +/*   Updated: 2020/02/14 17:20:06 by rbousset         ###   ########lyon.fr   */ +/*                                                                            */ +/* ************************************************************************** */ + +#	ifndef CUB3D_STRUCTS_H +#	define CUB3D_STRUCTS_H  typedef struct		s_win  { @@ -99,4 +111,4 @@ typedef struct		s_cub  	struct s_rgb	c_rgb;  }					t_cub; -#endif +#	endif  | 
