From 25876a36d5e606c4d965ae2c24521185c9b6ecd5 Mon Sep 17 00:00:00 2001 From: Timo Schmidt Date: Wed, 5 Apr 2023 10:24:49 +0200 Subject: [PATCH] Working demonstration --- obj/io.o | Bin 0 -> 1960 bytes obj/main.o | Bin 0 -> 3008 bytes obj/map_helpers.o | Bin 0 -> 1536 bytes obj/parsing.o | Bin 0 -> 3480 bytes obj/parsing_simple.o | Bin 0 -> 1776 bytes obj/printing.o | Bin 0 -> 2504 bytes obj/solution.o | Bin 0 -> 2736 bytes srcs/main.c | 35 +++++++++++++++++++++++++++++++++-- srcs/printing.c | 3 +-- 9 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 obj/io.o create mode 100644 obj/main.o create mode 100644 obj/map_helpers.o create mode 100644 obj/parsing.o create mode 100644 obj/parsing_simple.o create mode 100644 obj/printing.o create mode 100644 obj/solution.o diff --git a/obj/io.o b/obj/io.o new file mode 100644 index 0000000000000000000000000000000000000000..c6099b46306dfc8991f3ff8329c5612b7aa4f846 GIT binary patch literal 1960 zcmb_d&1(}u6rXMS5v4UjswfKPq(X5?^-`%wq^yq8)FK3Xu+%i&eqcUIvMH?)EX3BX zOQGnc7w^6JA9%1-tk6r2xw#(11U*FX&_f~q-tJ7gZ0pSjGw;psz4x1WZzh`;+VI^r zMPX7DcAFipB+A&;jzc@#yCKeI2nq7-ZzzDaZs1UscEHP@qT@TEOD}0Rw?C-IEd6P>4R zc4|?n=08#o9b;G9r_}l?O=MX}wu%)VD55;{xG!PLL>!@1+qfzT|!MKSssb^J` zNjF!&jLBV>&ys1CDlUcG>^w!iMJrGVN{ri|+k*&$ZPJBdICZhaWHDYncZ+by7n)lBotFOz;gAYVE&rb5C+IjS0BmQ!o5%SAtnCPV2FPg-?wl3aBu4m1 zG-K(1;1S@&Gb(bNnqbq@JdS5f#7D%B(5VsFdkhl18%7uEyjtAWR{|k~2QVc5lRyaJ zG$bAqyndb~58ma8f8)VBJ@^L??&XglhJ-rm?P`obh{R<-o;v6uF6$0-cC>dfHLs_W zs-Z6$Oikr789i&TRBnE0VsgpQ3v9kvm=&g)%^A9SZzOT8U?fw|n3_&6WG0eRQ+S{= zf=8d7n9e6NI?Liw9cmUy1QhVWICNovALX@Vrs$28_7xNr3~r+AdBFj`|-;= zY93_GRjpaHx3#9;6GqxAF|la)68vwA++r(lI@=P5+7jpqXu6}ISf3M`zLmrg6>F)Y z;*#kr?-h9*sr%rRwm0sv$oFDo`(sC3Y~CL}CIITMSLFF6b|1!Z^^XdWi$JQMdMxv0 r{e!>)!_6GjGDb@_MZWxdq+ShHiG_W)o5&T8IiE z6naxAc=RNm6!c)Fwop%=y?GKVcu)lCAyD6&o!N|=OOjL&dlgm0xx(4v3BSFXp0^OllaAd;pPvk4`Y zg1bLY@`hGa*)Hm>MA}rcDlt_hl}PKjOq;3-9}rD5lAtoWlq3?AW+`)^7qe8GMoO_1 zgd4Lb(6(iay7@x;ra-R5A#5#S6NY~T{w^9`WlOO(a1ZmraZVs z8_S7j7IVF4@zZDs!u#hCelNVX>SjdV7d}6{k360~zZt*+le-3}B^ZvJXGH$D8RJoS a-?l}_Q&_lbM_&jpC&&~FK!tU>_x}wG1L(N` literal 0 HcmV?d00001 diff --git a/obj/map_helpers.o b/obj/map_helpers.o new file mode 100644 index 0000000000000000000000000000000000000000..e589152e950162f697a572157baf5bb30df2ac2c GIT binary patch literal 1536 zcmb`G&1(};5Wr`Xw63+f!4DKaXh6kNmqbsZ$QF5Zk){+OH%r`Zw;y!#L9!`P2o_RH z*R_zN{uTZQB2>hqM-LHlh|od~@njE$IJ5g+x+Xa~@OEZ?^YP~8<-KNevk^%GArd@- z6Hicpt>}rZ`KAUFn3>VtUvBN#tsHsm_`{#tk^6mde??WMw*92WP&^z}ru=%n-bw0i zt?O1gZsx#Ew>@@nhPCTQpuD+^ZFG-ybx(`yX1en>ChxM|;d{hhtwRy7C?C*XE^7^u zCU%Ol7KK*cX7dCXrq}1F0I9u1%hj8+Z}dk+@tw%yv*QbxfG))z5=Xf}9}%BF zi9aWf@{>Ly9{CX@5E~&GWHI>N8xeviM27HHB`=lOO|b@j#YI)H4C|% zm3Ls>DU@KHPE?i+XW>di~M4UIEn>uD;0p{={5VPcnF{4P+w6 QPY@pt8{DTlYB{+7UzgO^^8f$< literal 0 HcmV?d00001 diff --git a/obj/parsing.o b/obj/parsing.o new file mode 100644 index 0000000000000000000000000000000000000000..f6887aff9b0917580440d82d8add51596fec3b8c GIT binary patch literal 3480 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 XthWFQ*N%3-@S +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/04 21:50:50 by tischmid #+# #+# */ -/* Updated: 2023/04/05 10:05:40 by tischmid ### ########.fr */ +/* Updated: 2023/04/05 10:18:04 by tischmid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,12 +15,43 @@ #include "printing.h" #include "ft_string.h" +void debug_set_map(t_map *map) +{ + char *str; + + str = \ + "........................................" \ + "...................X...................." \ + ".........................X..........X..." \ + "..............X........................." \ + ".........X...........................X.." \ + "............X..X........................" \ + "..................................X....." \ + "....................................X..." \ + "........................................" \ + "X.X..........................X.........." \ + "....X.................................X." \ + "..........X............................." \ + ".............................X.........." \ + "....................X......X............" \ + "............................X...X......X" \ + ".......X........X....X....X..XX........." \ + "................X........X............X." \ + "................X......X................" \ + "....X................X.......X.........." \ + "........................................"; + map->data = malloc(sizeof(char) * (ft_strlen(str) + 1)); + ft_strcpy(map->data, str); +} + int main(void) { t_map map; - if (!read_fname("./assets/subject.map", &map)) + if (!read_fname("./assets/map20x40.map", &map)) return (ft_err("map error\n", 1)); + free(map.data); + debug_set_map(&map); map.copy = malloc(sizeof(char) * (ft_strlen(map.data) + 1)); ft_strcpy(map.copy, map.data); solve(&map); diff --git a/srcs/printing.c b/srcs/printing.c index 3909c30..bba54e8 100644 --- a/srcs/printing.c +++ b/srcs/printing.c @@ -6,7 +6,7 @@ /* By: tischmid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/05 04:09:39 by tischmid #+# #+# */ -/* Updated: 2023/04/05 10:00:23 by tischmid ### ########.fr */ +/* Updated: 2023/04/05 10:19:12 by tischmid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -57,7 +57,6 @@ void print_map(t_map *map, int as_numbers) int i; int j; - ft_putstr("\nMap 2d:\n"); i = -1; while (++i < map->meta.height) {