diff options
Diffstat (limited to '')
| -rw-r--r-- | map/map_one.cub | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/map/map_one.cub b/map/map_one.cub index f47183c..cc4b774 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,18 +1,30 @@ -R 1000 720 +R 1400 900 +<<<<<<< HEAD +NO ./media/img/BRIQUASSES.xpm +SO ./media/img/BRIQUASSE_3.xpm +EA ./media/img/BRIQUASSES_2.xpm +WE ./media/img/MURLOL.xpm +S ./media/img/MURLOL.xpm +======= NO ./map/img/BRIQUASSES.xpm SO ./map/img/BRIQUASSE_3.xpm EA ./map/img/BRIQUASSES_2.xpm WE ./map/img/MURLOL.xpm S ./map/img/pillar.xpm +>>>>>>> sprites C 50,100,200 F 50,190,124 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 2 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 1 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 +<<<<<<< HEAD +1 S 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 1 +======= 1 E 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 1 +>>>>>>> sprites 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 1 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 |