diff --git a/Makefile b/Makefile index 6e7929b..39d0358 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,7 @@ $(NAME): $(OBJS) $(CC) $(OBJS) -o $@ $(LFLAGS) $(CFLAGS) leaks: $(NAME) - valgrind --leak-check=full --show-leak-kinds=all ./$(NAME) + valgrind --leak-check=full --show-leak-kinds=all ./$(NAME) maps/map_valid_03.cub clean: $(RM_OBJS) diff --git a/headers/memorybook.h b/headers/memorybook.h index 200cf78..febfd3f 100644 --- a/headers/memorybook.h +++ b/headers/memorybook.h @@ -6,7 +6,7 @@ /* By: pblagoje +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/05/04 13:35:47 by pblagoje #+# #+# */ -/* Updated: 2022/05/04 13:36:44 by pblagoje ### ########.fr */ +/* Updated: 2022/05/04 17:39:33 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ # define MEMORYBOOK_H // memorybook.c -void mb_init(void(*f)(void*), void *param); +void mb_init(void (*f)(void*), void *param); void *mb_alloc(size_t size); void mb_add(void *addr); void mb_free(void *addr); diff --git a/libft.txt b/libft.txt deleted file mode 100644 index ac60b77..0000000 --- a/libft.txt +++ /dev/null @@ -1,24 +0,0 @@ -ft_abs -ft_arrint -ft_atoi -ft_bzero -ft_free_2d -ft_lstcreate -ft_lsterase -ft_lstfind -ft_lstfree -ft_lstpush_back -ft_memalloc -ft_putchar_fd -ft_putnbr_fd -ft_putstr_fd -ft_sign -ft_split -ft_strchr -ft_strcmp -ft_strdup -ft_strlen -ft_strlen_2d -ft_strnstr -ft_strrchr -ft_substr diff --git a/libs/libft/Makefile b/libs/libft/Makefile index ef8e13a..c1d3d09 100644 --- a/libs/libft/Makefile +++ b/libs/libft/Makefile @@ -11,7 +11,7 @@ _DEP = libft.h DEPS = $(_DEP:%.h=$(IDIR)/%.h) CFLAGS = -I$(IDIR) -CFLAGS += -Wall -Wextra -Werror +CFLAGS += -Wall -Wextra -Werror -g3 SRCS = \ ft_bzero.c \ diff --git a/libs/libft/includes/ft_gnl.h b/libs/libft/includes/ft_gnl.bak similarity index 100% rename from libs/libft/includes/ft_gnl.h rename to libs/libft/includes/ft_gnl.bak diff --git a/libs/libft/includes/ft_printf.h b/libs/libft/includes/ft_printf.bak similarity index 100% rename from libs/libft/includes/ft_printf.h rename to libs/libft/includes/ft_printf.bak diff --git a/libs/libft/includes/libft.h b/libs/libft/includes/libft.h index 5c0e5fd..c4948e3 100644 --- a/libs/libft/includes/libft.h +++ b/libs/libft/includes/libft.h @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:45:53 by hulamy #+# #+# */ -/* Updated: 2022/05/04 16:04:03 by hulamy ### ########.fr */ +/* Updated: 2022/05/04 18:18:01 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -28,7 +28,7 @@ void ft_putchar_fd(char c, int fd); void ft_putstr_fd(char *s, int fd); void ft_putnbr_fd(int n, int fd); -typedef struct s_list +typedef struct s_list { void *content; struct s_list *prev; @@ -37,14 +37,14 @@ typedef struct s_list t_list *ft_lstcreate(void *content); void *ft_lstpush_back(t_list **lst, t_list *new); -t_list *ft_lstfind(t_list *lst, void *to_find, int (*comp)(void*, void *)); +t_list *ft_lstfind(t_list *lst, void *to_find, + int (*comp)(void*, void *)); void ft_lsterase(t_list *lst, void (*del)(void *)); void ft_lstfree(t_list *lst, void (*del)(void *)); int ft_strcmp(const char *s1, const char *s2); void *ft_memalloc(size_t size); int ft_abs(int n); int ft_sign(int i); - -int ft_arrint(int * intarr, int comp, size_t size); +int ft_arrint(int *intarr, int comp, size_t size); #endif diff --git a/libs/libft/srcs/ft_split.c b/libs/libft/srcs/ft_split.c index 06a7dd0..87f25a0 100644 --- a/libs/libft/srcs/ft_split.c +++ b/libs/libft/srcs/ft_split.c @@ -5,8 +5,8 @@ /* +:+ +:+ +:+ */ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2019/12/12 22:41:54 by hulamy #+# #+# */ -/* Updated: 2022/05/04 14:11:07 by pblagoje ### ########.fr */ +/* Created: 2022/05/04 18:15:10 by hulamy #+# #+# */ +/* Updated: 2022/05/04 18:35:56 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,25 +15,25 @@ */ /* -** #include ** #include ** #include -** +** #include +** ** size_t ft_strlen(const char *str) ** { ** size_t i; -** +** ** i = 0; ** while (str[i]) ** i++; ** return (i); ** } -** +** ** char *ft_substr(char const *s, unsigned int start, size_t len) ** { ** char *str; ** size_t i; -** +** ** if (!s) ** return (NULL); ** if (ft_strlen(s) < start) @@ -46,29 +46,30 @@ ** str[i] = '\0'; ** return (str); ** } -** +** ** char **ft_split(char const *s, char c); ** char **ft_strsplit(char const *s, char c); -** +** ** int main(void) ** { ** char **str; ** int i; -** +** ** char *s; ** char c; -** +** ** i = -1; -** s = NULL; +** // s = NULL; +** s = "hello les amis :)"; ** c = ' '; ** str = ft_split(s, c); -** //if (str) -** //{ -** printf("s : '%s'\n", s); -** printf("*str : '%p'\n", str[0]); -** while (str[++i]) -** printf("str[%i] : '%s'\n", i, str[i]); -** //} +** printf("s : '%s'\n", s); +** printf("*str : '%p'\n", str[0]); +** while (str[++i]) +** printf("str[%i] : '%s'\n", i, str[i]); +** while (str[--i]) +** free(str[i]); +** free(str); ** return (0); ** } */ @@ -89,7 +90,7 @@ static int count(char const *s, char c) return (words); } -void *ft_free(char **array, int w) +void *free_array(char **array, int w) { int i; @@ -109,6 +110,14 @@ char **empty_s(char **empty) return (empty); } +static int copy_portion(char **array, char const *s, int len) +{ + *array = ft_substr(s, 0, len); + if (!(*array)) + return (0); + return (1); +} + char **ft_split(char const *s, char c) { char **array; @@ -128,8 +137,8 @@ char **ft_split(char const *s, char c) { while (s[len] != '\0' && s[len] != c) len++; - if (!(array[w++] = ft_substr(s, 0, len))) - return (ft_free(array, w)); + if (!copy_portion(&array[w++], s, len)) + return (free_array(array, w)); s += len - 1; } s++; diff --git a/maps/map_valid_03.cub b/maps/map_valid_03.cub index 861d42c..020c0ed 100644 --- a/maps/map_valid_03.cub +++ b/maps/map_valid_03.cub @@ -4,7 +4,7 @@ WE ./textures/wood.xpm EA ./textures/blue.xpm F 66, 66 , 66 -C 33 , 5 55 , 33 +C 33 , 55 , 33 111111111111111111111111 100000000000000000000001 diff --git a/srcs/hook/keyhook.c b/srcs/hook/keyhook.c index fe856b7..5457b88 100644 --- a/srcs/hook/keyhook.c +++ b/srcs/hook/keyhook.c @@ -6,7 +6,7 @@ /* By: pblagoje +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/05/04 13:45:52 by pblagoje #+# #+# */ -/* Updated: 2022/05/04 13:47:13 by pblagoje ### ########.fr */ +/* Updated: 2022/05/04 17:23:50 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -47,7 +47,7 @@ int hook_action(t_game *game) int keypress(int keycode, t_game *game) { - unsigned i; + unsigned int i; print_keycode(keycode, &game->plr); i = 0; @@ -62,7 +62,7 @@ int keypress(int keycode, t_game *game) int keyrelease(int keycode, t_game *game) { - unsigned i; + unsigned int i; i = 0; while (i < MAX_NB_KEY && game->k_hook[i] != keycode) diff --git a/srcs/mem/memorybook_2d.c b/srcs/mem/memorybook_2d.c index 0789c64..b7fbb37 100644 --- a/srcs/mem/memorybook_2d.c +++ b/srcs/mem/memorybook_2d.c @@ -6,7 +6,7 @@ /* By: pblagoje +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/05/04 13:55:48 by pblagoje #+# #+# */ -/* Updated: 2022/05/04 13:55:51 by pblagoje ### ########.fr */ +/* Updated: 2022/05/04 18:32:14 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -22,6 +22,7 @@ void mb_add_2d(void **addr, int nb) mb_add(addr[i]); i++; } + mb_add(addr); } void mb_free_2d(void **addr, int nb) @@ -34,4 +35,5 @@ void mb_free_2d(void **addr, int nb) mb_free(addr[i]); i++; } + mb_free(addr); } diff --git a/srcs/mem/memorybook_2d.c~ b/srcs/mem/memorybook_2d.c~ new file mode 100644 index 0000000..1131cff --- /dev/null +++ b/srcs/mem/memorybook_2d.c~ @@ -0,0 +1,38 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* memorybook_2d.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: pblagoje +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/05/04 13:55:48 by pblagoje #+# #+# */ +/* Updated: 2022/05/04 18:31:18 by hulamy ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "cube3d.h" + +void mb_add_2d(void **addr, int nb) +{ + int i; + + i = 0; + while (i < nb) + { + mb_add(addr[i]); + i++; + } + mb_add(addr); +} + +void mb_free_2d(void **addr, int nb) +{ + int i; + + i = 0; + while (i < nb) + { + mb_free(addr[i]); + i++; + } +}