diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-30 16:20:10 +0200 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-30 16:20:10 +0200 |
| commit | f3ef7f448c8551df9c723d22d33a6fac0b966c22 (patch) | |
| tree | 982d3e931f77d30a2cc7c2d28ea6129c5f7467ca /inc | |
| parent | Less fat sprites (diff) | |
| download | 42-cub3d-f3ef7f448c8551df9c723d22d33a6fac0b966c22.tar.gz 42-cub3d-f3ef7f448c8551df9c723d22d33a6fac0b966c22.tar.bz2 42-cub3d-f3ef7f448c8551df9c723d22d33a6fac0b966c22.tar.xz 42-cub3d-f3ef7f448c8551df9c723d22d33a6fac0b966c22.tar.zst 42-cub3d-f3ef7f448c8551df9c723d22d33a6fac0b966c22.zip | |
Fixed conditionnal jump btw
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d_defines.h | 6 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index a479b7f..3d09a81 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -177,11 +177,11 @@ enum */ # define FT_CHRST_VALID_PARSE "RNSEWFCLMT" -# define FT_CHRST_MAP_ENTRY "0123456789NSEWLT!@+# " +# define FT_CHRST_MAP_ENTRY "0123456789NSEWLT!@+#e " # define FT_CHRST_SPRITES "23456789" # define FT_CHRST_SPAWN "NSEW" -# define FT_CHRST_MAP_NON_WALL "023456789NESWLT!@+#" -# define FT_CHRST_COLLISION "123456789 " +# define FT_CHRST_MAP_NON_WALL "023456789NESWLT!@+#e" +# define FT_CHRST_COLLISION "123456789e " # define FT_CHRST_DETECT "1L" # define FT_CHRST_ITEM "!@+#" # define FT_CHRST_WEAPONS "!@#" diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index a5c2bcc..3134786 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -227,6 +227,7 @@ typedef struct s_map typedef struct s_bad_boy { int8_t life; + int8_t does; void (*act[5])(struct s_sprite*, struct s_map*); } t_bad_boy; @@ -271,7 +272,7 @@ typedef struct s_cub struct s_img death_screen; struct s_rgb f_rgb; struct s_rgb c_rgb; - struct s_img tlist[23]; + struct s_img tlist[27]; struct s_img tweap[6]; struct s_img tnum[12]; struct s_sprite **sprites; |