19 files changed, 60 insertions, 16 deletions
diff --git a/map/map_four.cub b/map/map_four.cub
new file mode 100644
index 0000000..67d3c2d
--- /dev/null
+++ b/map/map_four.cub
@@ -0,0 +1,32 @@
+R 1600 1100
+
+NO ./media/img/larry.xpm
+SO ./media/img/larry.xpm
+EA ./media/img/larry.xpm
+WE ./media/img/larry.xpm
+S ./media/img/larry.xpm
+
+C 26,165,204
+F 24,170,25
+
+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 0 0 0 0 0 0 0 1 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 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 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 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 0 0 1 1 1 1 1
+1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 0 0 0 0 0 0 0 1
+1 S 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 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 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 0 0 1 1 1 1 1
+1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 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 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 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 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 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 0 0 0 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
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
diff --git a/map/map_three.cub b/map/map_three.cub
index c60779a..fade5ef 100644
--- a/map/map_three.cub
+++ b/map/map_three.cub
@@ -1,15 +1,15 @@
 R 1000 720
 
-NO ./map/img/BRIQUASSES.xpm
-SO ./map/img/BRIQUASSES.xpm
-EA ./map/img/hey.xpm
-WE ./map/img/left_arrow.xpm
-S ./map/img/segfot.xpm
+NO ./media/img/BRIQUASSES.xpm
+SO ./media/img/BRIQUASSES.xpm
+EA ./media/img/hey.xpm
+WE ./media/img/left_arrow.xpm
+S ./media/img/segfot.xpm
 
 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 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1
-1 E 0 0 0 0 0 0 0 0 0 0 0 0 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 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 1
+1 E 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
+1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
diff --git a/map/map_two.cub b/map/map_two.cub
index 1553c25..c1f3e29 100644
--- a/map/map_two.cub
+++ b/map/map_two.cub
@@ -1,10 +1,10 @@
 R 1920 1024
 
-NO ./map/img/linuz.xpm
-SO ./map/img/linuz.xpm
-EA ./map/img/linuz.xpm
-WE ./map/img/linuz.xpm
-S ./map/img/segfot.xpm
+NO ./media/img/linuz.xpm
+SO ./media/img/linuz.xpm
+EA ./media/img/linuz.xpm
+WE ./media/img/linuz.xpm
+S ./media/img/linuz.xpm
 
 C 50,100,200
 F 150,150,124
diff --git a/map/img/BRIQUASSES.xpm b/media/img/BRIQUASSES.xpm
index 04a3e2b..04a3e2b 100644
--- a/map/img/BRIQUASSES.xpm
+++ b/media/img/BRIQUASSES.xpm
diff --git a/map/img/BRIQUASSES_2.xpm b/media/img/BRIQUASSES_2.xpm
index c2d1e06..c2d1e06 100644
--- a/map/img/BRIQUASSES_2.xpm
+++ b/media/img/BRIQUASSES_2.xpm
diff --git a/map/img/BRIQUASSE_3.xpm b/media/img/BRIQUASSE_3.xpm
index cd56455..cd56455 100644
--- a/map/img/BRIQUASSE_3.xpm
+++ b/media/img/BRIQUASSE_3.xpm
diff --git a/map/img/MURLOL.xpm b/media/img/MURLOL.xpm
index d8fcd2c..d8fcd2c 100644
--- a/map/img/MURLOL.xpm
+++ b/media/img/MURLOL.xpm
diff --git a/map/img/crapaud.xpm b/media/img/crapaud.xpm
index cbe2bad..cbe2bad 100644
--- a/map/img/crapaud.xpm
+++ b/media/img/crapaud.xpm
diff --git a/map/img/frde.xpm b/media/img/frde.xpm
index 24207a7..24207a7 100644
--- a/map/img/frde.xpm
+++ b/media/img/frde.xpm
diff --git a/map/img/hey.xpm b/media/img/hey.xpm
index 7f3e1ed..7f3e1ed 100644
--- a/map/img/hey.xpm
+++ b/media/img/hey.xpm
diff --git a/map/img/left_arrow.xpm b/media/img/left_arrow.xpm
index 45141de..45141de 100644
--- a/map/img/left_arrow.xpm
+++ b/media/img/left_arrow.xpm
diff --git a/map/img/linus.xpm b/media/img/linus.xpm
index 54073da..54073da 100644
--- a/map/img/linus.xpm
+++ b/media/img/linus.xpm
diff --git a/map/img/linuz.xpm b/media/img/linuz.xpm
index bf5934a..bf5934a 100644
--- a/map/img/linuz.xpm
+++ b/media/img/linuz.xpm
diff --git a/map/img/pillar.xpm b/media/img/pillar.xpm
index 4a0c656..4a0c656 100644
--- a/map/img/pillar.xpm
+++ b/media/img/pillar.xpm
diff --git a/map/img/segfault2.xpm b/media/img/segfault2.xpm
index c4d5f22..c4d5f22 100644
--- a/map/img/segfault2.xpm
+++ b/media/img/segfault2.xpm
diff --git a/map/img/segfot.xpm b/media/img/segfot.xpm
index 63613c3..63613c3 100644
--- a/map/img/segfot.xpm
+++ b/media/img/segfot.xpm
diff --git a/map/img/terre.xpm b/media/img/terre.xpm
index 4554732..4554732 100644
--- a/map/img/terre.xpm
+++ b/media/img/terre.xpm
diff --git a/map/img/tex.xpm b/media/img/tex.xpm
index 0b1acdd..0b1acdd 100644
--- a/map/img/tex.xpm
+++ b/media/img/tex.xpm