diff options
| author | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-17 16:49:57 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-17 16:49:57 +0100 |
| commit | 0fc1331cb4e576344451ae2151151bd2b36825a3 (patch) | |
| tree | 3b9bbaffaea2ffc1634cd2899fbabaa7126e0006 | |
| parent | Merge branch 'tex_fmoen' of gitlab.com into tex_fmoen (diff) | |
| download | 42-cub3d-0fc1331cb4e576344451ae2151151bd2b36825a3.tar.gz 42-cub3d-0fc1331cb4e576344451ae2151151bd2b36825a3.tar.bz2 42-cub3d-0fc1331cb4e576344451ae2151151bd2b36825a3.tar.xz 42-cub3d-0fc1331cb4e576344451ae2151151bd2b36825a3.tar.zst 42-cub3d-0fc1331cb4e576344451ae2151151bd2b36825a3.zip | |
Solved HEAD conflicts
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | map/map_one.cub | 8 |
2 files changed, 0 insertions, 11 deletions
@@ -52,11 +52,8 @@ SRCS_NAME += ft_init_s_ray.c SRCS_NAME += ft_init_map.c SRCS_NAME += ft_tex_init.c SRCS_NAME += ft_detect.c -<<<<<<< HEAD SRCS_NAME += ft_check_ext.c -======= SRCS_NAME += ft_draw_textures.c ->>>>>>> 8a89388d397b50f2c70cef05f8fa6cfa10cc213c #--------------------------------------------------------------------------------------------------# SRCS = $(addprefix ${SRCS_DIR},${SRCS_NAME}) #--------------------------------------------------------------------------------------------------# diff --git a/map/map_one.cub b/map/map_one.cub index c3b5bdf..b2635f8 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,18 +1,10 @@ R 1200 800 -<<<<<<< HEAD -NO ./path_to_the_north_texture.xpm -SO ./path_to_the_south_texture.xpm -EA ./path_to_the_east_texture.xpm -WE ./path_to_the_west_texture.xpm -S ./path_to_the_sprite_texture.xpm -======= NO ./map/img/crapaud.xpm SO ./map/img/linus.xpm EA ./map/img/linuz.xpm WE ./map/img/segfault2.xpm S ./map/img/segfot.xpm ->>>>>>> 8a89388d397b50f2c70cef05f8fa6cfa10cc213c C 50,100,200 F 150,150,124 |