aboutsummaryrefslogtreecommitdiffstats
path: root/inc
diff options
context:
space:
mode:
authorJozanLeClerc <bousset.rudy@gmail.com>2020-03-18 22:21:29 +0100
committerJozanLeClerc <bousset.rudy@gmail.com>2020-03-18 22:21:29 +0100
commit8fda101ccda5c23bfd9cd604f0c3124a9b83aa1d (patch)
treeeaf3adca241ec77c8af19adbfdf5871e305c6d01 /inc
parentWorks fine (diff)
download42-cub3d-8fda101ccda5c23bfd9cd604f0c3124a9b83aa1d.tar.gz
42-cub3d-8fda101ccda5c23bfd9cd604f0c3124a9b83aa1d.tar.bz2
42-cub3d-8fda101ccda5c23bfd9cd604f0c3124a9b83aa1d.tar.xz
42-cub3d-8fda101ccda5c23bfd9cd604f0c3124a9b83aa1d.tar.zst
42-cub3d-8fda101ccda5c23bfd9cd604f0c3124a9b83aa1d.zip
ok bav
Diffstat (limited to 'inc')
-rw-r--r--inc/cub3d.h1
-rw-r--r--inc/cub3d_defines.h2
-rw-r--r--inc/cub3d_structs.h4
3 files changed, 5 insertions, 2 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h
index 4f1bc72..84ce976 100644
--- a/inc/cub3d.h
+++ b/inc/cub3d.h
@@ -184,5 +184,6 @@ t_bmp_rgb ft_hex_to_rgb(uint32_t color);
uint32_t ft_darken(t_rgb rgb, t_cub *cl);
void ft_death_screen(t_cub *cl);
void ft_get_fps_count(clock_t delta_time, t_cub *cl);
+void ft_find_item(t_player *pl, t_map *ml, t_cub *cl);
# endif
diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h
index 237cdad..e82fef5 100644
--- a/inc/cub3d_defines.h
+++ b/inc/cub3d_defines.h
@@ -140,6 +140,7 @@ enum
# define FT_CHRST_MAP_NON_WALL "023456789NESWLT+"
# define FT_CHRST_COLLISION "123456789 "
# define FT_CHRST_DETECT "1L"
+# define FT_CHRST_ITEM "+!@"
/*
** ====== BMP ======
@@ -224,5 +225,6 @@ enum
*/
# define FT_PARSE_END_RET 25
+# define FT_HEAL_PACK_AMOUNT 10
# endif
diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h
index e4936eb..dc2b411 100644
--- a/inc/cub3d_structs.h
+++ b/inc/cub3d_structs.h
@@ -113,8 +113,8 @@ typedef struct s_sprite
int32_t y;
int32_t tex_x;
int32_t tex_y;
- int32_t s_pos_x;
- int32_t s_pos_y;
+ uint64_t s_pos_x;
+ uint64_t s_pos_y;
double spritex;
double spritey;
int32_t spriteheight;