aboutsummaryrefslogtreecommitdiffstats
path: root/inc
diff options
context:
space:
mode:
authorJozanLeClerc <bousset.rudy@gmail.com>2020-03-19 16:39:26 +0100
committerJozanLeClerc <bousset.rudy@gmail.com>2020-03-19 16:39:26 +0100
commit39257df9e9c18665545464467a48d1ec26f094a9 (patch)
tree9f8d7c77cdbc583762a2964c568e70ca50e2d527 /inc
parentAdded new sprite (diff)
download42-cub3d-39257df9e9c18665545464467a48d1ec26f094a9.tar.gz
42-cub3d-39257df9e9c18665545464467a48d1ec26f094a9.tar.bz2
42-cub3d-39257df9e9c18665545464467a48d1ec26f094a9.tar.xz
42-cub3d-39257df9e9c18665545464467a48d1ec26f094a9.tar.zst
42-cub3d-39257df9e9c18665545464467a48d1ec26f094a9.zip
Few changes
Diffstat (limited to '')
-rw-r--r--inc/cub3d_defines.h2
-rw-r--r--inc/cub3d_structs.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h
index 0d8c37f..c423ac7 100644
--- a/inc/cub3d_defines.h
+++ b/inc/cub3d_defines.h
@@ -100,7 +100,7 @@ enum
# define FT_DEATH_SCREEN_PATH "./media/img/screens/death_screen.xpm"
# define FT_HUD_BACK_PATH "./media/img/tex/plate_small.xpm"
# define FT_WEAPON_ONE_SPR_PATH "./media/img/sprites/sword_s.xpm"
-# define FT_WEAPON_TWO_SPR_PATH "./media/img/sprites/sword_s.xpm"
+# define FT_WEAPON_TWO_SPR_PATH "./media/img/sprites/colt_s.xpm"
# define FT_WEAPON_ONE_PATH "./media/img/weapons/sword_w.xpm"
# define FT_WEAPON_ONE_FIRE_PATH "./media/img/weapons/sword_w_fire.xpm"
# define FT_WEAPON_TWO_PATH "./media/img/weapons/sword_w.xpm"
diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h
index 8e38e36..ba6243b 100644
--- a/inc/cub3d_structs.h
+++ b/inc/cub3d_structs.h
@@ -143,6 +143,8 @@ typedef struct s_player
float plane_x;
float plane_y;
int8_t life;
+ uint8_t has_weapon[2];
+ int8_t handles_weapon;
} t_player;
typedef struct s_ray