From 8d0ee0aed921ecb3a9962135945e7315905e2141 Mon Sep 17 00:00:00 2001 From: kinou-p Date: Mon, 14 Feb 2022 01:12:34 +0100 Subject: [PATCH] done --- map/bad_name.be | 10 ++++++++++ map/empty_map.ber | 0 map/impossible.ber | 6 ++++++ map/map.ber | 14 +++++++------- map/no_exit.ber | 10 ++++++++++ map/no_item.ber | 10 ++++++++++ map/no_player.ber | 10 ++++++++++ map/not_close.ber | 10 ++++++++++ map/tall.ber | 13 +++++++++++++ map/two_player.ber | 10 ++++++++++ map/wide.ber | 3 +++ srcs/parsing.c | 4 ++-- 12 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 map/bad_name.be create mode 100644 map/empty_map.ber create mode 100644 map/impossible.ber create mode 100644 map/no_exit.ber create mode 100644 map/no_item.ber create mode 100644 map/no_player.ber create mode 100644 map/not_close.ber create mode 100644 map/tall.ber create mode 100644 map/two_player.ber create mode 100644 map/wide.ber diff --git a/map/bad_name.be b/map/bad_name.be new file mode 100644 index 0000000..fa77beb --- /dev/null +++ b/map/bad_name.be @@ -0,0 +1,10 @@ +1111111111111 +1E110C00C0001 +1000000011001 +10C011CC01C01 +100011C001C01 +10C000C000C01 +100001C001C01 +1000100C01C01 +1P0001C000C01 +1111111111111 \ No newline at end of file diff --git a/map/empty_map.ber b/map/empty_map.ber new file mode 100644 index 0000000..e69de29 diff --git a/map/impossible.ber b/map/impossible.ber new file mode 100644 index 0000000..c318dc3 --- /dev/null +++ b/map/impossible.ber @@ -0,0 +1,6 @@ +111111111111111111 +1CEEEEEEEEEEEEEEE1 +1EE000000000000001 +10C0000000C0000001 +10000C0000000000P1 +111111111111111111 \ No newline at end of file diff --git a/map/map.ber b/map/map.ber index 52dc518..55319f5 100644 --- a/map/map.ber +++ b/map/map.ber @@ -1,10 +1,10 @@ 1111111111111 1E110C00C0001 -1000P01011001 -10C011C001C01 -10C011C001C01 -10C011C001C01 -10C011C001C01 -10C011C001C01 -10C011C001C01 +1000000011001 +10C011CC01C01 +100011C001C01 +10C000C000C01 +100001C001C01 +1000100C01C01 +1P0001C000C01 1111111111111 diff --git a/map/no_exit.ber b/map/no_exit.ber new file mode 100644 index 0000000..0f689a5 --- /dev/null +++ b/map/no_exit.ber @@ -0,0 +1,10 @@ +1111111111111 +10110C00C0001 +1000000011001 +10C011CC01C01 +100011C001C01 +10C000C000C01 +100001C001C01 +1000100C01C01 +1P0001C000C01 +1111111111111 \ No newline at end of file diff --git a/map/no_item.ber b/map/no_item.ber new file mode 100644 index 0000000..a23f11d --- /dev/null +++ b/map/no_item.ber @@ -0,0 +1,10 @@ +1111111111111 +1E11000000001 +1000000011001 +1000110001001 +1000110001001 +1000000000001 +1000010001001 +1000100001001 +1P00010000001 +1111111111111 \ No newline at end of file diff --git a/map/no_player.ber b/map/no_player.ber new file mode 100644 index 0000000..00dbace --- /dev/null +++ b/map/no_player.ber @@ -0,0 +1,10 @@ +1111111111111 +1E110C00C0001 +1000000011001 +10C011CC01C01 +100011C001C01 +10C000C000C01 +100001C001C01 +1000100C01C01 +100001C000C01 +1111111111111 \ No newline at end of file diff --git a/map/not_close.ber b/map/not_close.ber new file mode 100644 index 0000000..1176f63 --- /dev/null +++ b/map/not_close.ber @@ -0,0 +1,10 @@ +1111111111111 +1E110C00C0001 +1000000011001 +10C011CC01C01 +100011C001C01 +10C000C000C00 +100001C001C01 +1000100C01C01 +1P0001C000C01 +1111111111111 \ No newline at end of file diff --git a/map/tall.ber b/map/tall.ber new file mode 100644 index 0000000..0d2ea7d --- /dev/null +++ b/map/tall.ber @@ -0,0 +1,13 @@ +111 +1P1 +1C1 +1C1 +1C1 +1C1 +1C1 +1C1 +1C1 +1C1 +1C1 +1E1 +111 diff --git a/map/two_player.ber b/map/two_player.ber new file mode 100644 index 0000000..059d2eb --- /dev/null +++ b/map/two_player.ber @@ -0,0 +1,10 @@ +1111111111111 +1E110C00C0001 +1000000011001 +10C011CC01C01 +100011C001C01 +10C000C000C01 +100001C001C01 +1000100C01C01 +1PP001C000C01 +1111111111111 \ No newline at end of file diff --git a/map/wide.ber b/map/wide.ber new file mode 100644 index 0000000..bd11869 --- /dev/null +++ b/map/wide.ber @@ -0,0 +1,3 @@ +111111111111111111111 +1ECCCCCCCCCCCCCCCCCP1 +111111111111111111111 \ No newline at end of file diff --git a/srcs/parsing.c b/srcs/parsing.c index 1bbd34e..01f20ff 100644 --- a/srcs/parsing.c +++ b/srcs/parsing.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/02/13 22:26:34 by apommier #+# #+# */ -/* Updated: 2022/02/13 23:47:44 by apommier ### ########.fr */ +/* Updated: 2022/02/14 00:58:23 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -74,7 +74,7 @@ int is_item(char **map) i = 1; while (map[j][i]) { - if (map[j][i++] == 'E') + if (map[j][i++] == 'C') item++; } j++;