fotonmoton/fdf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wrongs symbols check

Browse source
This commit is contained in:
Gregory 2017-03-16 01:33:17 +02:00
parent 7f902e30dc
commit f7e00e930f
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/hooks.c
View file

@ -2,6 +2,7 @@
int key_hook(int keycode, void *FDF) int key_hook(int keycode, void *FDF)
{ {
printf("%d\n", keycode);
if (keycode == 65307) if (keycode == 65307)
quit(FDF); quit(FDF);
if (keycode == 113) if (keycode == 113)
@ -24,5 +25,7 @@ int key_hook(int keycode, void *FDF)
zoom_in(FDF); zoom_in(FDF);
if (keycode == 65453) if (keycode == 65453)
zoom_out(FDF); zoom_out(FDF);
if (keycode == 114)
reset(FDF);
return (0); return (0);
} }

16
src/map_init.c
View file

@ -5,13 +5,18 @@ int wrong_symbols(char **line)
char *tmp; char *tmp;
tmp = *line; tmp = *line;
while (*tmp) while ((*tmp == '-' || ft_isdigit(*tmp)) && *tmp)
tmp++;
if ((ft_strstr(tmp, ",0x") == tmp) && (tmp += 3))
{ {
while ((*tmp == '-' || (*tmp >= '0' && *tmp <= '9') || *tmp == ',' || *tmp == 'x') && *tmp) if (!*tmp)
tmp++;
if (!tmp)
return (1); return (1);
else
while (ft_isdigit(*tmp) || (*tmp >= 'A' && *tmp <= 'F'))
tmp++;
} }
if (*tmp)
return (1);
return (0); return (0);
} }
@ -40,7 +45,6 @@ int map_width(char **tab)
line_tab = ft_strsplit(*tab, ' '); line_tab = ft_strsplit(*tab, ' ');
width = tab_length(line_tab); width = tab_length(line_tab);
width_tmp = width; width_tmp = width;
tab++;
while (*tab) while (*tab)
{ {
if ((line_tab = ft_strsplit(*tab, ' '))) if ((line_tab = ft_strsplit(*tab, ' ')))
@ -120,4 +124,4 @@ t_map *map_init(char *path)
free(str_map); free(str_map);
free_tab(tab_map); free_tab(tab_map);
return (map); return (map);
} }

4
tests/simple.fdf
View file

@ -1,3 +1,3 @@
0 0 1a 0
1 1 1 1
0 0 0 1