logistic-bot/cub3d
1
0
Fork 0
mirror of https://codeberg.org/ACME-Corporation/cub3d.git synced 2025-12-06 01:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: put all populate_map related code in that file

Browse source
This commit is contained in:
Khaïs COLIN 2025-07-21 15:22:41 +02:00
parent b564311851
commit 3e28da1fcf
Signed by: logistic-bot
SSH key fingerprint: SHA256:RlpiqKeXpcPFZZ4y9Ou4xi2M8OhRJovIwDlbCaMsuAo
6 changed files with 66 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/map/checkers.h
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/17 14:39:41 by kcolin #+# #+# */
/* Updated: 2025/07/17 15:55:09 by kcolin ### ########.fr */
/* Updated: 2025/07/21 15:24:14 by kcolin ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,7 +17,6 @@
# include "mapdata.h"
bool check_filename(t_mapdata *map, char *file);
void populate_maps(t_mapdata *map, int fd);
bool check_walls(t_mapdata *map);
bool check_bare_minimum(t_mapdata *map);

4
src/map/map_checker.c
View file

@ -6,16 +6,16 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/06/06 17:54:42 by tchampio #+# #+# */
/* Updated: 2025/07/17 15:53:51 by kcolin ### ########.fr */
/* Updated: 2025/07/21 15:25:16 by kcolin ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../libft/includes/libft.h"
#include "../utils/colors.h"
#include "populate_map.h"
#include "checkers.h"
#include "setters.h"
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
void print_mapdata(const t_mapdata *data)

43
src/map/populate_map.c
View file

@ -6,12 +6,51 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/17 14:44:02 by kcolin #+# #+# */
/* Updated: 2025/07/17 15:53:38 by kcolin ### ########.fr */
/* Updated: 2025/07/21 15:23:47 by kcolin ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../libft/includes/libft.h"
#include "setters.h"
#include "../utils/frees.h"
int copy_old_map(t_mapdata *map, char **newmap, char **newmapflood, int length)
{
int i;
i = 0;
if (!map->map)
return (0);
while (i < length)
{
newmap[i] = ft_strdup(map->map[i]);
newmapflood[i] = ft_strdup(map->mapflood[i]);
i++;
}
return (i);
}
void add_map_line(const char *line, t_mapdata *map)
{
static int length = 0;
char **newmap;
char **newmapflood;
int i;
newmap = ft_calloc(sizeof(char *), (length + 2));
if (!newmap)
return ;
newmapflood = ft_calloc(sizeof(char *), (length + 2));
if (!newmapflood)
return ;
i = copy_old_map(map, newmap, newmapflood, length);
newmap[i] = ft_strdup(line);
newmapflood[i] = ft_strdup(line);
free_tab_length(map->map, length);
free_tab_length(map->mapflood, length);
map->mapheight = ++length;
map->map = newmap;
map->mapflood = newmapflood;
}
void populate_maps(t_mapdata *map, int fd)
{

20
src/map/populate_map.h Normal file
View file

@ -0,0 +1,20 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* populate_map.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/21 15:24:31 by kcolin #+# #+# */
/* Updated: 2025/07/21 15:25:02 by kcolin ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef POPULATE_MAP_H
# define POPULATE_MAP_H
# include "mapdata.h"
void populate_maps(t_mapdata *map, int fd);
#endif // POPULATE_MAP_H

41
src/map/setters.c
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/06/21 19:35:43 by tchampio #+# #+# */
/* Updated: 2025/07/21 12:48:50 by kcolin ### ########.fr */
/* Updated: 2025/07/21 15:22:41 by kcolin ### ########.fr */
/* */
/* ************************************************************************** */
@ -90,42 +90,3 @@ bool add_textures(int fd, t_mapdata *map)
free(line);
return (true);
}
int copy_old_map(t_mapdata *map, char **newmap, char **newmapflood, int length)
{
int i;
i = 0;
if (!map->map)
return (0);
while (i < length)
{
newmap[i] = ft_strdup(map->map[i]);
newmapflood[i] = ft_strdup(map->mapflood[i]);
i++;
}
return (i);
}
void add_map_line(const char *line, t_mapdata *map)
{
static int length = 0;
char **newmap;
char **newmapflood;
int i;
newmap = ft_calloc(sizeof(char *), (length + 2));
if (!newmap)
return ;
newmapflood = ft_calloc(sizeof(char *), (length + 2));
if (!newmapflood)
return ;
i = copy_old_map(map, newmap, newmapflood, length);
newmap[i] = ft_strdup(line);
newmapflood[i] = ft_strdup(line);
free_tab_length(map->map, length);
free_tab_length(map->mapflood, length);
map->mapheight = ++length;
map->map = newmap;
map->mapflood = newmapflood;
}

3
src/map/setters.h
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/17 14:40:32 by kcolin #+# #+# */
/* Updated: 2025/07/17 15:54:11 by kcolin ### ########.fr */
/* Updated: 2025/07/21 15:22:57 by kcolin ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,6 +17,5 @@
# include "mapdata.h"
bool add_textures(int fd, t_mapdata *map);
void add_map_line(const char *line, t_mapdata *map);
#endif // SETTERS_H