aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRudy Bousset <rbousset@z2r5p2.le-101.fr>2020-02-28 20:56:59 +0100
committerRudy Bousset <rbousset@z2r5p2.le-101.fr>2020-02-28 20:56:59 +0100
commita126dec6a3ff78a118c09138af27a2f48f13adf8 (patch)
tree05c9d52c14d865543d9f4d87a9d73dee6541a0ff /src
parentRight but not perfect (diff)
download42-cub3d-a126dec6a3ff78a118c09138af27a2f48f13adf8.tar.gz
42-cub3d-a126dec6a3ff78a118c09138af27a2f48f13adf8.tar.bz2
42-cub3d-a126dec6a3ff78a118c09138af27a2f48f13adf8.tar.xz
42-cub3d-a126dec6a3ff78a118c09138af27a2f48f13adf8.tar.zst
42-cub3d-a126dec6a3ff78a118c09138af27a2f48f13adf8.zip
Normed
Diffstat (limited to '')
-rw-r--r--src/ft_detect.c1
-rw-r--r--src/ft_draw_textures.c3
-rw-r--r--src/ft_get_nlvl_pos.c12
-rw-r--r--src/ft_warp_level.c16
4 files changed, 28 insertions, 4 deletions
diff --git a/src/ft_detect.c b/src/ft_detect.c
index a59896a..a8b5a6c 100644
--- a/src/ft_detect.c
+++ b/src/ft_detect.c
@@ -77,6 +77,5 @@ void
if (cl->mlist->map[cl->rlist.sqx][cl->rlist.sqy] == '1' ||
cl->mlist->map[cl->rlist.sqx][cl->rlist.sqy] == 'L')
cl->rlist.hit = 1;
-
}
}
diff --git a/src/ft_draw_textures.c b/src/ft_draw_textures.c
index d632182..39d6278 100644
--- a/src/ft_draw_textures.c
+++ b/src/ft_draw_textures.c
@@ -38,7 +38,8 @@ void ft_draw_texture(t_cub *cl, int x, int y, int tex_y)
void ft_choose_tex(t_cub *clist)
{
- if (clist->rlist.sqy == clist->mlist->nlx && clist->rlist.sqx == clist->mlist->nly )
+ if (clist->rlist.sqy == clist->mlist->nlx
+ && clist->rlist.sqx == clist->mlist->nly)
{
clist->w_side = 5;
}
diff --git a/src/ft_get_nlvl_pos.c b/src/ft_get_nlvl_pos.c
index 069b226..db726e1 100644
--- a/src/ft_get_nlvl_pos.c
+++ b/src/ft_get_nlvl_pos.c
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/* */
+/* ::: :::::::: */
+/* ft_get_nlvl_pos.c :+: :+: :+: */
+/* +:+ +:+ +:+ */
+/* By: rbousset <marvin@42.fr> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* Created: 2020/02/28 20:56:25 by rbousset #+# #+# */
+/* Updated: 2020/02/28 20:56:26 by rbousset ### ########lyon.fr */
+/* */
+/* ************************************************************************** */
+
#include <cub3d.h>
void
diff --git a/src/ft_warp_level.c b/src/ft_warp_level.c
index 8739550..3d8a732 100644
--- a/src/ft_warp_level.c
+++ b/src/ft_warp_level.c
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/* */
+/* ::: :::::::: */
+/* ft_warp_level.c :+: :+: :+: */
+/* +:+ +:+ +:+ */
+/* By: rbousset <marvin@42.fr> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* Created: 2020/02/28 20:54:28 by rbousset #+# #+# */
+/* Updated: 2020/02/28 20:54:29 by rbousset ### ########lyon.fr */
+/* */
+/* ************************************************************************** */
+
#include <libft.h>
#include <cub3d.h>
#include <stdlib.h>
@@ -44,8 +56,8 @@ int8_t
if ((uint32_t)cl->plist->pos_x == cl->mlist->nlx
&& (uint32_t)cl->plist->pos_y == cl->mlist->nly)
{
- if (!(next_path = (char *)malloc
- ((ft_strlen(cl->mlist->nlevel_path) + 1) * sizeof(char))))
+ if (!(next_path = (char *)malloc((ft_strlen(
+ cl->mlist->nlevel_path) + 1) * sizeof(char))))
return (-1);
ft_sprintf(next_path, "%s", cl->mlist->nlevel_path);
ft_del_map(cl->mlist);