diff options
Diffstat (limited to '')
| -rw-r--r-- | map/map_one.cub | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/map/map_one.cub b/map/map_one.cub index 637fef5..c3b5bdf 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,25 +1,33 @@ -R 1200 900 +R 1200 800 +<<<<<<< HEAD +NO ./path_to_the_north_texture.xpm +SO ./path_to_the_south_texture.xpm +EA ./path_to_the_east_texture.xpm +WE ./path_to_the_west_texture.xpm +S ./path_to_the_sprite_texture.xpm +======= NO ./map/img/crapaud.xpm SO ./map/img/linus.xpm EA ./map/img/linuz.xpm WE ./map/img/segfault2.xpm S ./map/img/segfot.xpm +>>>>>>> 8a89388d397b50f2c70cef05f8fa6cfa10cc213c -C 30,130,175 -F 150,150,145 +C 50,100,200 +F 150,150,124 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 -1 0 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 2 0 0 0 0 0 1 0 0 0 1 -1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 -1 0 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 -1 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 0 1 1 1 1 0 0 0 1 -1 1 1 1 0 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 0 0 0 1 0 0 0 1 -1 1 1 1 0 1 1 1 1 1 1 1 1 1 0 1 1 1 0 1 0 1 0 0 1 0 0 0 1 -1 1 0 0 0 0 0 0 1 1 0 1 0 1 0 1 1 1 0 0 0 0 0 0 1 0 0 0 1 -1 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 0 0 0 1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1 0 1 0 0 1 0 W 0 1 -1 1 0 0 0 0 0 0 1 1 0 1 0 1 0 1 1 1 1 1 0 1 1 1 1 0 0 0 1 -1 1 1 1 0 1 1 1 1 1 1 1 0 1 0 1 1 1 1 1 0 1 1 1 1 0 0 0 1 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +11111111111111111 1 +1 00000000011000001 +1N0100000000000001 +101100000111000001 +111111111111111111 +100000000011000001 +111101111111110111 +111101111111110111 +11000 0001101010111 +100020000000000011 +100000000000000011 +1100000011010101 11 +111101111111010111 +111111111111111111 |