aboutsummaryrefslogtreecommitdiffstats
path: root/inc
diff options
context:
space:
mode:
authorRudy Bousset <rbousset@z2r5p2.le-101.fr>2020-02-19 17:42:39 +0100
committerRudy Bousset <rbousset@z2r5p2.le-101.fr>2020-02-19 17:42:39 +0100
commit7b2b82106491c78e7a288a77db1f5080ef089d0f (patch)
tree493a98bc97be86c4aaf34dbe0d29730e855a725b /inc
parentCommit (diff)
download42-cub3d-7b2b82106491c78e7a288a77db1f5080ef089d0f.tar.gz
42-cub3d-7b2b82106491c78e7a288a77db1f5080ef089d0f.tar.bz2
42-cub3d-7b2b82106491c78e7a288a77db1f5080ef089d0f.tar.xz
42-cub3d-7b2b82106491c78e7a288a77db1f5080ef089d0f.tar.zst
42-cub3d-7b2b82106491c78e7a288a77db1f5080ef089d0f.zip
go merge
Diffstat (limited to 'inc')
-rw-r--r--inc/cub3d.h2
-rw-r--r--inc/cub3d_defines.h5
-rw-r--r--inc/cub3d_structs.h8
3 files changed, 7 insertions, 8 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h
index f7e4d79..87f6ef3 100644
--- a/inc/cub3d.h
+++ b/inc/cub3d.h
@@ -25,6 +25,7 @@
** 3: failed mlx init
** 4: map error
** 5: no map
+** 6: read error
*/
int8_t ft_init_cub3d(t_cub **clist);
@@ -81,5 +82,6 @@ int ft_key_loop(t_cub *cl);
void ft_draw_circle(int32_t a, int32_t b,
int32_t color, t_cub *cl);
void ft_draw_texture(t_cub *cl, int x, int y, int tex_y);
+int8_t ft_check_not_found(const char *path);
# endif
diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h
index 209d0bc..49b559a 100644
--- a/inc/cub3d_defines.h
+++ b/inc/cub3d_defines.h
@@ -82,6 +82,11 @@
# define FT_ERR_ILL_MAP "map contains illegal char"
# define FT_ERR_MULT_SPAWN "multiple spawn points"
# define FT_ERR_MAP_L_L "last line is invalid"
+# define FT_ERR_RD_NO "could not find north side texture file"
+# define FT_ERR_RD_SO "could not find south side texture file"
+# define FT_ERR_RD_EA "could not find east side texture file"
+# define FT_ERR_RD_WE "could not find west side texture file"
+# define FT_ERR_RD_SP "could not find sprite texture file"
/*
** ====== MISSING ERROR MSG ======
diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h
index 18edfd8..2c77758 100644
--- a/inc/cub3d_structs.h
+++ b/inc/cub3d_structs.h
@@ -47,14 +47,6 @@ typedef struct s_rgb
int16_t b;
} t_rgb;
-/*
-** player view_side:
-** 1: North
-** 2: East
-** 3: South
-** 4: West
-*/
-
typedef struct s_player
{
float pos_x;