diff options
| author | salaaad2 <arthurdurant263@gmail.com> | 2020-03-11 18:59:58 +0100 |
|---|---|---|
| committer | salaaad2 <arthurdurant263@gmail.com> | 2020-03-11 18:59:58 +0100 |
| commit | b6388b5101d8187f746f91c89842e932a1d01cb6 (patch) | |
| tree | 70bd9ba7012f5906db01b485ec8f58f5a4697240 /map/map_one.cub | |
| parent | close but no cigar (diff) | |
| parent | ca tue (diff) | |
| download | 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.gz 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.bz2 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.xz 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.zst 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.zip | |
get merged
Diffstat (limited to '')
| -rw-r--r-- | map/map_one.cub | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/map/map_one.cub b/map/map_one.cub index 680f4f8..b0eedb0 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,4 +1,4 @@ -R 1000 700 +R 1400 900 NO ./media/img/BRIQUASSES.xpm SO ./media/img/BRIQUASSES_2.xpm @@ -9,21 +9,28 @@ S ./media/img/pillar.xpm C ./media/img/arrow1.xpm F ./media/img/arrow2.xpm -SH 6 +T ./media/img/spikes.xpm +SH 4 111111111111111111 +<<<<<<< HEAD 100000000002000001 100000030002000001 100100000004000201 1011000N0111000001 +======= +120000000011000001 +100100000000000201 +101100000111000001 +>>>>>>> master 111111111111110011 1000001 100001 1001001 100001 1011001 100001 111101111111110111 110000001101010111 -100020000000000011 -100000000000000011 -110000001101010111 +100020T00000000011 +100000T00000W00011 +110000T01101010111 111101111111010111 11111 1 1111 |