From fbc52949004a067a5c2cfefae1ff3415dbe04a96 Mon Sep 17 00:00:00 2001 From: Rudy Bousset Date: Sat, 15 Feb 2020 18:51:30 +0100 Subject: In progress --- inc/cub3d_defines.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'inc/cub3d_defines.h') diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index e6c98c5..6f8de65 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -1,3 +1,15 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* cub3d_defines.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: rbousset +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/15 15:40:25 by rbousset #+# #+# */ +/* Updated: 2020/02/15 15:40:27 by rbousset ### ########lyon.fr */ +/* */ +/* ************************************************************************** */ + # ifndef CUB3D_DEFINES_H # define CUB3D_DEFINES_H @@ -45,6 +57,12 @@ ** ====== ERROR MSG ====== */ +# define FT_ERR_NOT_A_CUB "given map is not a .cub" +# define FT_ERR_MAP_L_L "last line is invalid or contains illegal char" +# define FT_ERR_UNFINISHED "unexpected file end" +# define FT_ERR_READ "read error" +# define FT_ERR_ILL_ENTRY "illegal map entry" +# define FT_ERR_ALR_SET "duplicate entry" # define FT_ERR_MISS_ELEMENT "Missing element:" # define FT_ERR_MISS_NORTH "north side texture" # define FT_ERR_MISS_SOUTH "south side texture" -- cgit v1.2.3 From 030fe8c3316d1e1f5f3dea81c3fffd8e00c16afa Mon Sep 17 00:00:00 2001 From: Rudy Bousset Date: Sat, 15 Feb 2020 20:29:21 +0100 Subject: Work in progress, res now --- inc/cub3d_defines.h | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'inc/cub3d_defines.h') diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 6f8de65..14ec61a 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -54,15 +54,26 @@ # endif /* -** ====== ERROR MSG ====== +** ====== MAP ERROR MSG ====== */ # define FT_ERR_NOT_A_CUB "given map is not a .cub" -# define FT_ERR_MAP_L_L "last line is invalid or contains illegal char" -# define FT_ERR_UNFINISHED "unexpected file end" +# define FT_ERR_ARGS "too many arguments" +# define FT_ERR_RES_SMALL "resolution is too small" +# define FT_ERR_RES_ALPHA "resolution should be digits only" +# define FT_ERR_MAP_L_L "last line is invalid" +# define FT_ERR_UNFINISHED "no map" # define FT_ERR_READ "read error" # define FT_ERR_ILL_ENTRY "illegal map entry" # define FT_ERR_ALR_SET "duplicate entry" +# define FT_ERR_ALLOCATE "allocation error" +# define FT_ERR_ILL_MAP "map contains illegal char" +# define FT_ERR_MULT_SPAWN "multiple spawn points" + +/* +** ====== MISSING ERROR MSG ====== +*/ + # define FT_ERR_MISS_ELEMENT "Missing element:" # define FT_ERR_MISS_NORTH "north side texture" # define FT_ERR_MISS_SOUTH "south side texture" @@ -71,7 +82,7 @@ # define FT_ERR_MISS_SPRITE "sprite texture" # define FT_ERR_MISS_RESOLUTION "resolution" # define FT_ERR_MISS_FLOOR_C "floor color" -# define FT_ERR_MISS_CEIL_C "floor color" +# define FT_ERR_MISS_CEIL_C "ceiling color" # define FT_ERR_MISS_PLAYER_SPAWN "player spawn" # endif -- cgit v1.2.3 From 2fd013d7583e0388d50ff9895c5e474e2d76f79f Mon Sep 17 00:00:00 2001 From: Rudy Bousset Date: Mon, 17 Feb 2020 15:31:11 +0100 Subject: Better parse for textures and colors --- inc/cub3d_defines.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'inc/cub3d_defines.h') diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 14ec61a..e9a9a7d 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -57,18 +57,22 @@ ** ====== MAP ERROR MSG ====== */ +# define FT_ERR_ALLOCATE "allocation error" +# define FT_ERR_READ "read error" # define FT_ERR_NOT_A_CUB "given map is not a .cub" -# define FT_ERR_ARGS "too many arguments" +# define FT_ERR_ARGS "too many or to few arguments" # define FT_ERR_RES_SMALL "resolution is too small" # define FT_ERR_RES_ALPHA "resolution should be digits only" -# define FT_ERR_MAP_L_L "last line is invalid" -# define FT_ERR_UNFINISHED "no map" -# define FT_ERR_READ "read error" +# define FT_ERR_NOT_A_XPM "given texture is not a .xpm" +# define FT_ERR_COLOR_ALPHA "colors should be digits only" +# define FT_ERR_COLOR_MAX "colors should be maximum 255" +# define FT_ERR_COLOR_ARGS "colors three numbers separated by commas" # define FT_ERR_ILL_ENTRY "illegal map entry" +# define FT_ERR_UNFINISHED "no map" # define FT_ERR_ALR_SET "duplicate entry" -# define FT_ERR_ALLOCATE "allocation error" # 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" /* ** ====== MISSING ERROR MSG ====== -- cgit v1.2.3 From ac87f799abf2edbd95243f2343eda41faf30cca6 Mon Sep 17 00:00:00 2001 From: Rudy Bousset Date: Mon, 17 Feb 2020 15:57:18 +0100 Subject: Better parse --- inc/cub3d_defines.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'inc/cub3d_defines.h') diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index e9a9a7d..0c9a294 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -67,8 +67,9 @@ # define FT_ERR_COLOR_ALPHA "colors should be digits only" # define FT_ERR_COLOR_MAX "colors should be maximum 255" # define FT_ERR_COLOR_ARGS "colors three numbers separated by commas" -# define FT_ERR_ILL_ENTRY "illegal map entry" # define FT_ERR_UNFINISHED "no map" +# define FT_ERR_MAP_LEN "map length inconsistency" +# define FT_ERR_ILL_ENTRY "illegal map entry" # define FT_ERR_ALR_SET "duplicate entry" # define FT_ERR_ILL_MAP "map contains illegal char" # define FT_ERR_MULT_SPAWN "multiple spawn points" -- cgit v1.2.3