42/42_old_fillit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto stash before merge of "master" and "origin/ralentit"

Browse Source
This commit is contained in:
Manzovince
2019-06-01 14:54:12 +02:00
parent 5d4de7718e
commit 482861a3c9
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
f_bonus_print.c
View File

@@ -59,7 +59,6 @@ int print_binary_map(unsigned int *map, int size, int *dope)
print_sized_map(map, size, size, '#'); print_sized_map(map, size, size, '#');
ft_putchar('\n'); ft_putchar('\n');
} }
free(map);
return (size); return (size);
} }

11
f_print.c
View File

@@ -1,7 +1,7 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* print.c :+: :+: :+: */ /* f_print.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */ /* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
@@ -13,8 +13,8 @@
#include "fillit.h" #include "fillit.h"
/* /*
** function that print a map of height and width ** Function that print a map of height and width
** usefull to print tetris ** useful to print tetris
*/ */
void print_sized_map(unsigned int *tab, int width, int height, char letter) void print_sized_map(unsigned int *tab, int width, int height, char letter)
@@ -44,7 +44,7 @@ void print_sized_map(unsigned int *tab, int width, int height, char letter)
/* /*
** Print the final map with the letters ** Print the final map with the letters
** if flag value is 0 -> print moulinette version ** if flag value is 0 -> print moulinette version
** if flag value is 0 -> print in color ** if flag value is p -> print in color
*/ */
char *init_print_map(t_fillist *list, int size) char *init_print_map(t_fillist *list, int size)
@@ -53,7 +53,8 @@ char *init_print_map(t_fillist *list, int size)
int i; int i;
int j; int j;
map = (char *)malloc(sizeof(*map) * (size * size + 1)); if (!(map = (char *)malloc(sizeof(*map) * (size * size + 1))))
return (NULL);
map[size * size] = '\0'; map[size * size] = '\0';
i = -1; i = -1;
while (++i < size * size) while (++i < size * size)

3
main.c
View File

@@ -30,7 +30,7 @@ int *create_dope(char *av, int mdp)
comp = "dope"; comp = "dope";
if (!(dope = (int*)malloc(sizeof(*dope) * 4))) if (!(dope = (int*)malloc(sizeof(*dope) * 4)))
return (NULL); return (0);
i = 0; i = 0;
while (i < 4) while (i < 4)
dope[i++] = 0; dope[i++] = 0;
@@ -110,5 +110,6 @@ int main(int ac, char **av)
else else
print_error("usage: Please submit a file.\n> ./fillit file.fillit\n"); print_error("usage: Please submit a file.\n> ./fillit file.fillit\n");
free(dope); free(dope);
while (1) ;
return (0); return (0);
} }