rparodi/Cub3D
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: removed the t_img texture and left the t_texture instead.

Browse source
This commit is contained in:
B.Goulard 2024-12-17 17:28:51 +01:00
parent eda859f200
commit 7f1091b721
9 changed files with 35 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

17
parsing/load_textures.c
View file

@ -6,10 +6,11 @@
/* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/01 17:46:52 by bgoulard #+# #+# */
/* Updated: 2024/12/17 16:58:30 by bgoulard ### ########.fr */
/* Updated: 2024/12/17 17:22:21 by bgoulard ### ########.fr */
/* */
/* ************************************************************************** */
#include "cub3d.h"
#include "cub3d_struct.h"
#include "cub3d_parsing.h"
@ -19,12 +20,6 @@
#include <stdbool.h>
#include <stdio.h>
static void sv_errno(t_info *inf, int err_code)
{
inf->errno_state = errno;
inf->last_error = err_code;
}
bool load_texture(t_info *info, const char *str, const char **id_str)
{
size_t i;
@ -35,7 +30,7 @@ bool load_texture(t_info *info, const char *str, const char **id_str)
{
if (ft_strstart_with(str, id_str[i]))
{
if (info->map.texture_[i].img != NULL)
if (info->map.texture[i].img != NULL)
return (sv_errno(info, ERROR_PARSE_ALREADY_SET), false);
texture.path = ft_strtrim(str + ft_strlen(id_str[i]), " \t");
if (texture.path == NULL)
@ -46,7 +41,7 @@ bool load_texture(t_info *info, const char *str, const char **id_str)
&texture.width, &texture.height);
if (texture.img == NULL)
return (sv_errno(info, ERROR_MLX), false);
return (info->map.texture_[i] = texture, true);
return (info->map.texture[i] = texture, true);
}
i++;
}
@ -70,9 +65,9 @@ void *load_textures(void *data)
}
i = 0;
errno = 0;
while (i < sizeof(info->map.texture_) / sizeof(info->map.texture_[0]))
while (i < sizeof(info->map.texture) / sizeof(info->map.texture[0]))
{
if (info->map.texture_[i].img == NULL || info->map.texture[i] == NULL)
if (info->map.texture[i].img == NULL)
return (sv_errno(info, ERROR_TEXTURE_MISSING), NULL);
i++;
}

8
parsing/utils.c
View file

@ -6,7 +6,7 @@
/* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/01 17:43:17 by bgoulard #+# #+# */
/* Updated: 2024/12/16 09:39:50 by bgoulard ### ########.fr */
/* Updated: 2024/12/17 17:17:53 by bgoulard ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,6 +17,12 @@
#include <X11/X.h>
#include <stdio.h>
void sv_errno(t_info *inf, int err_code)
{
inf->errno_state = errno;
inf->last_error = err_code;
}
t_tile *c3_get_cell(t_tile *map, t_ipoint dimensions, t_ipoint pos)
{
if (pos.x < 0 || pos.y < 0 || pos.x >= dimensions.x