starnakin/42_solong
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kekw

Browse Source
This commit is contained in:
Camille Chauvet
2023-01-19 13:41:58 +01:00
parent 7d7de10b7a
commit 8b200fb8ba
15 changed files with 164 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mandatory/asset.c
View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/01/06 14:23:00 by cchauvet #+# #+# */
/* Updated: 2023/01/16 18:27:18 by cchauvet ### ########.fr */
/* Updated: 2023/01/18 17:32:05 by cchauvet ### ########.fr */
/* */
/* ************************************************************************** */
@ -47,7 +47,7 @@ int ft_gen_assets(t_data *data)
i++;
}
data->assets[NB_COLORS] = ft_gen_asset(colors[i],
WINDOW_SIZE, data);
(RENDER_DISTANCE * 2 + 1) * CASE_SIZE, data);
if (data->assets[NB_COLORS] == NULL)
return (1);
ft_freer_tab_ultimate(1, colors);

6
mandatory/main.c
View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/12 17:20:17 by cchauvet #+# #+# */
/* Updated: 2023/01/16 18:23:34 by cchauvet ### ########.fr */
/* Updated: 2023/01/18 17:31:16 by cchauvet ### ########.fr */
/* */
/* ************************************************************************** */
@ -31,7 +31,9 @@ int ft_initialised(char *path, t_data *data)
}
ft_printf("\rGenerating assets [FINISHED]\n");
data->map = map;
data->window = mlx_new_window(data->mlx, WINDOW_SIZE, WINDOW_SIZE, "long");
data->window = mlx_new_window(data->mlx,
(RENDER_DISTANCE * 2 + 1) * CASE_SIZE,
(RENDER_DISTANCE * 2 + 1) * CASE_SIZE, "long");
ft_draw_map(data);
mlx_hook(data->window, 17, (0L), ft_exit, data);
mlx_hook(data->window, 2, (1L << 0), ft_key, data);

15
mandatory/solong.h
View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/01/04 16:20:03 by cchauvet #+# #+# */
/* Updated: 2023/01/16 18:36:30 by cchauvet ### ########.fr */
/* Updated: 2023/01/18 17:29:43 by cchauvet ### ########.fr */
/* */
/* ************************************************************************** */
@ -22,15 +22,14 @@
# define COLORS "gold|white|pink|red|gray"
# define NB_COLORS 4
# define RENDER_DISTANCE 5
# define WINDOW_SIZE (RENDER_DISTANCE * 2 + 1) * CASE_SIZE
typedef struct s_square
typedef struct s_square
{
char *color;
size_t size;
} t_square;
} t_square;
typedef struct s_map
typedef struct s_map
{
size_t x_len;
size_t y_len;
@ -38,15 +37,15 @@ typedef struct s_map
char **patern;
size_t player_pos[2];
size_t exit_pos[2];
} t_map;
} t_map;
typedef struct s_data
typedef struct s_data
{
void *mlx;
void *window;
void *assets[NB_COLORS + 1];
t_map *map;
} t_data;
} t_data;
//void ft_ultimate_image_destroyer(t_data *data);
int ft_test_map_is_finishable(t_map *map);