diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-29 17:38:46 +0200 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-29 17:38:46 +0200 |
| commit | a07392fc219afc45000201d2f495694ad9b82763 (patch) | |
| tree | 0eb3f2b9003ad7ceae4692242e46de56e55053b0 /src/ft_select_get.c | |
| parent | Removed skybox shit (diff) | |
| parent | Norm (diff) | |
| download | 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.tar.gz 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.tar.bz2 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.tar.xz 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.tar.zst 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.zip | |
Merge branch 'fix-details'
Diffstat (limited to 'src/ft_select_get.c')
| -rw-r--r-- | src/ft_select_get.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ft_select_get.c b/src/ft_select_get.c index d311528..0edc4f2 100644 --- a/src/ft_select_get.c +++ b/src/ft_select_get.c @@ -33,11 +33,12 @@ static int8_t return (-1); else if (ret == 5 && (clist->mlist.sprite_path[0][0])) return (-1); - else if (ret == 6 && ((clist->f_rgb.r != -1) || (clist->f_rgb.g != -1) - || (clist->f_rgb.b != -1))) + if (ret == 6 && (((clist->f_rgb.r != -1) || (clist->f_rgb.g != -1) + || (clist->f_rgb.b != -1)) || clist->mlist.fl_tex_path[0])) return (-1); - else if ((ret == 7 || ret == 12) && ((clist->c_rgb.r != -1) || - (clist->c_rgb.g != -1) || (clist->c_rgb.b != -1))) + if ((ret == 7 || ret == 12) && (((clist->c_rgb.r != -1) || + (clist->c_rgb.g != -1) || (clist->c_rgb.b != -1)) || + clist->mlist.ce_tex_path[0])) return (-1); return (ret); } |