aboutsummaryrefslogtreecommitdiffstats
path: root/map
diff options
context:
space:
mode:
authorRudy Bousset <rbousset@z2r4p3.le-101.fr>2020-03-09 23:08:39 +0100
committerRudy Bousset <rbousset@z2r4p3.le-101.fr>2020-03-09 23:08:39 +0100
commita4eae07949127cbdfa9030ad086c1d0edfa8e1f5 (patch)
tree419651274887318990adb6e434d5f5bcfb835340 /map
parentgang_2 (diff)
parentMap update (diff)
download42-cub3d-a4eae07949127cbdfa9030ad086c1d0edfa8e1f5.tar.gz
42-cub3d-a4eae07949127cbdfa9030ad086c1d0edfa8e1f5.tar.bz2
42-cub3d-a4eae07949127cbdfa9030ad086c1d0edfa8e1f5.tar.xz
42-cub3d-a4eae07949127cbdfa9030ad086c1d0edfa8e1f5.tar.zst
42-cub3d-a4eae07949127cbdfa9030ad086c1d0edfa8e1f5.zip
Merge branch 'skybox'
Diffstat (limited to 'map')
-rw-r--r--map/lvl_five.cub2
-rw-r--r--map/lvl_four.cub6
-rw-r--r--map/lvl_one.cub5
-rw-r--r--map/lvl_three.cub6
-rw-r--r--map/lvl_two.cub6
-rw-r--r--map/map_five.cub1
6 files changed, 17 insertions, 9 deletions
diff --git a/map/lvl_five.cub b/map/lvl_five.cub
index 22d66ab..87c6cfb 100644
--- a/map/lvl_five.cub
+++ b/map/lvl_five.cub
@@ -12,7 +12,7 @@ F ./media/img/plate_small.xpm
LT ./media/img/larry.xpm
L ./map/map_four.cub
-SH 20
+SH 16
MU ./media/sound/TAPE-DU-PIED-ET-FRAPPE-TA-TANTE.wav
111111111111111111111111111111
diff --git a/map/lvl_four.cub b/map/lvl_four.cub
index ff39482..a562044 100644
--- a/map/lvl_four.cub
+++ b/map/lvl_four.cub
@@ -6,10 +6,12 @@ EA ./media/img/arrow3.xpm
WE ./media/img/arrow4.xpm
S ./media/img/pillar.xpm
-C 180,70,110
-F 100,140,114
+C ./media/img/arrow4.xpm
+F ./media/img/arrow2.xpm
MU ./media/sound/TAPE-DU-PIED-ET-FRAPPE-TA-TANTE.wav
+SH 8
+
LT ./media/img/plate.xpm
L ./map/lvl_five.cub
diff --git a/map/lvl_one.cub b/map/lvl_one.cub
index 6df5ad2..456f130 100644
--- a/map/lvl_one.cub
+++ b/map/lvl_one.cub
@@ -6,9 +6,10 @@ EA ./media/img/BRIQUASSE_3.xpm
WE ./media/img/BRIQUASSE_3.xpm
S ./media/img/segfot.xpm
-C 50,100,200
-F 50,190,124
+C ./media/img/BRIQUASSE_3.xpm
+F ./media/img/BRIQUASSE_3.xpm
+SH 4
L ./map/lvl_two.cub
LT ./media/img/crapaud.xpm
diff --git a/map/lvl_three.cub b/map/lvl_three.cub
index 45e51d9..d429b98 100644
--- a/map/lvl_three.cub
+++ b/map/lvl_three.cub
@@ -6,8 +6,10 @@ EA ./media/img/brickwall.xpm
WE ./media/img/brickwall.xpm
S ./media/img/pillar.xpm
-C 100,100,175
-F 100,160,114
+C ./media/img/brickwall.xpm
+F ./media/img/brickwall.xpm
+
+SH 4
LT ./media/img/crapaud.xpm
L ./map/lvl_four.cub
diff --git a/map/lvl_two.cub b/map/lvl_two.cub
index 6c76feb..2e12e19 100644
--- a/map/lvl_two.cub
+++ b/map/lvl_two.cub
@@ -6,8 +6,10 @@ EA ./media/img/BRIQUASSE_3.xpm
WE ./media/img/BRIQUASSE_3.xpm
S ./media/img/pillar.xpm
-C 100,100,175
-F 50,190,124
+C ./media/img/BRIQUASSE_3.xpm
+F ./media/img/BRIQUASSE_3.xpm
+
+SH 4
L ./map/lvl_three.cub
LT ./media/img/crapaud.xpm
diff --git a/map/map_five.cub b/map/map_five.cub
index cd0a944..3c6bc4a 100644
--- a/map/map_five.cub
+++ b/map/map_five.cub
@@ -8,6 +8,7 @@ S ./media/img/crapaud.xpm
F ./media/img/terre.xpm
C 225,30,0
+SB ./media/img/normal_sky.xpm
LT ./media/img/linuz.xpm
L ./map/map_two.cub