Better folder structure

51 files changed, 92 insertions, 90 deletions

diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h
index 1aa380f..15ff3b5 100644
--- a/inc/cub3d_defines.h
+++ b/inc/cub3d_defines.h
@@ -92,8 +92,10 @@ enum
 #   define FT_SFX_SCR_ONE_PATH	"./media/sound/sfx/scream_one.wav"
 #   define FT_SFX_SCR_TWO_PATH	"./media/sound/sfx/scream_two.wav"
 #   define FT_SFX_TRAP_PATH		"./media/sound/sfx/trap.wav"
-#   define FT_DEATH_SCREEN_PATH	"./media/img/death_screen.xpm"
-#   define FT_HUD_BACK_PATH		"./media/img/plate_small.xpm"
+#   define FT_DEATH_SCREEN_PATH	"./media/img/screens/death_screen.xpm"
+#   define FT_HUD_BACK_PATH		"./media/img/tex/plate_small.xpm"
+#   define FT_WEAPON_ONE_PATH	"./media/img/weapons/sword_w.xpm"
+#   define FT_WEAPON_TWO_PATH	"./media/img/weapons/sword_w.xpm"
 
 /*
 ** ====== SOUNDS ======
diff --git a/map/lvl_five.cub b/map/lvl_five.cub
index f88bde8..9d7cd2b 100644
--- a/map/lvl_five.cub
+++ b/map/lvl_five.cub
@@ -1,18 +1,18 @@
 R 1600 1050
 
-NO ./media/img/plate_small.xpm
-SO ./media/img/plate_small.xpm
-EA ./media/img/plate_small.xpm
-WE ./media/img/plate_small.xpm
-S ./media/img/pillar.xpm
+NO ./media/img/tex/plate_small.xpm
+SO ./media/img/tex/plate_small.xpm
+EA ./media/img/tex/plate_small.xpm
+WE ./media/img/tex/plate_small.xpm
+S ./media/img/sprites/pillar.xpm
 
-C ./media/img/plate_small.xpm
-F ./media/img/plate_small.xpm
+C ./media/img/tex/plate_small.xpm
+F ./media/img/tex/plate_small.xpm
 
-LT ./media/img/cowtits.xpm
+LT ./media/img/tex/cowtits.xpm
 L ./map/map_four.cub
 
-T ./media/img/spikes.xpm
+T ./media/img/sprites/spikes.xpm
 SH 16
 MU ./media/sound/BITURE-ET-MELANCOLIE.wav
 
diff --git a/map/lvl_four.cub b/map/lvl_four.cub
index a1ec7bf..04b4bdd 100644
--- a/map/lvl_four.cub
+++ b/map/lvl_four.cub
@@ -1,19 +1,19 @@
 R 1800 1200
 
-NO ./media/img/arrow1.xpm
-SO ./media/img/arrow2.xpm
-EA ./media/img/arrow3.xpm
-WE ./media/img/arrow4.xpm
-S ./media/img/pillar.xpm
+NO ./media/img/tex/arrow1.xpm
+SO ./media/img/tex/arrow2.xpm
+EA ./media/img/tex/arrow3.xpm
+WE ./media/img/tex/arrow4.xpm
+S ./media/img/sprites/pillar.xpm
 
-C ./media/img/left_arrow.xpm
-F ./media/img/arrow5.xpm
+C ./media/img/tex/left_arrow.xpm
+F ./media/img/tex/arrow5.xpm
 MU ./media/sound/BITURE-ET-MELANCOLIE.wav
 
 SH 8
 
-T ./media/img/spikes.xpm
-LT ./media/img/plate.xpm
+T ./media/img/sprites/spikes.xpm
+LT ./media/img/tex/plate_small.xpm
 L ./map/lvl_five.cub
 
 
diff --git a/map/lvl_one.cub b/map/lvl_one.cub
index 688f216..deb2fce 100644
--- a/map/lvl_one.cub
+++ b/map/lvl_one.cub
@@ -1,18 +1,18 @@
 R 1500 950
 
-NO ./media/img/BRIQUASSE_3.xpm
-SO ./media/img/BRIQUASSE_3.xpm
-EA ./media/img/BRIQUASSE_3.xpm
-WE ./media/img/BRIQUASSE_3.xpm
-S ./media/img/pylon.xpm
+NO ./media/img/tex/BRIQUASSE_3.xpm
+SO ./media/img/tex/BRIQUASSE_3.xpm
+EA ./media/img/tex/BRIQUASSE_3.xpm
+WE ./media/img/tex/BRIQUASSE_3.xpm
+S ./media/img/sprites/pylon.xpm
 
-C ./media/img/BRIQUASSE_3.xpm
-F ./media/img/ground.xpm
+C ./media/img/tex/BRIQUASSE_3.xpm
+F ./media/img/tex/ground.xpm
 
-T media/img/spikes.xpm
+T media/img/sprites/spikes.xpm
 SH 4
 L ./map/lvl_two.cub
-LT ./media/img/crapaud.xpm
+LT ./media/img/tex/crapaud.xpm
 
 MU ./media/sound/BITURE-ET-MELANCOLIE.wav
 
diff --git a/map/lvl_three.cub b/map/lvl_three.cub
index 0c56584..726bb84 100644
--- a/map/lvl_three.cub
+++ b/map/lvl_three.cub
@@ -1,18 +1,18 @@
 R 500 500
 
-NO ./media/img/brickwall.xpm
-SO ./media/img/brickwall.xpm
-EA ./media/img/brickwall.xpm
-WE ./media/img/brickwall.xpm
-S ./media/img/pillar.xpm
+NO ./media/img/tex/brickwall.xpm
+SO ./media/img/tex/brickwall.xpm
+EA ./media/img/tex/brickwall.xpm
+WE ./media/img/tex/brickwall.xpm
+S ./media/img/sprites/pillar.xpm
 
-C ./media/img/brickwall.xpm
-F ./media/img/brickwall.xpm
+C ./media/img/tex/brickwall.xpm
+F ./media/img/tex/brickwall.xpm
 
 SH 4
 
-T ./media/img/spikes.xpm
-LT ./media/img/crapaud.xpm
+T ./media/img/sprites/spikes.xpm
+LT ./media/img/tex/crapaud.xpm
 L ./map/lvl_four.cub
 
 MU ./media/sound/BITURE-ET-MELANCOLIE.wav
diff --git a/map/lvl_two.cub b/map/lvl_two.cub
index 0700d9b..d2dd8bb 100644
--- a/map/lvl_two.cub
+++ b/map/lvl_two.cub
@@ -1,18 +1,18 @@
 R 500 500
 
-NO ./media/img/BRIQUASSE_3.xpm
-SO ./media/img/BRIQUASSE_3.xpm
-EA ./media/img/BRIQUASSE_3.xpm
-WE ./media/img/BRIQUASSE_3.xpm
-S ./media/img/linus.xpm
+NO ./media/img/tex/BRIQUASSE_3.xpm
+SO ./media/img/tex/BRIQUASSE_3.xpm
+EA ./media/img/tex/BRIQUASSE_3.xpm
+WE ./media/img/tex/BRIQUASSE_3.xpm
+S ./media/img/sprites/linus.xpm
 
-C ./media/img/BRIQUASSE_3.xpm
-F ./media/img/ground.xpm
+C ./media/img/tex/BRIQUASSE_3.xpm
+F ./media/img/tex/ground.xpm
 
 SH 4
 
 L ./map/lvl_three.cub
-LT ./media/img/crapaud.xpm
+LT ./media/img/tex/crapaud.xpm
 
 MU ./media/sound/BITURE-ET-MELANCOLIE.wav
 
diff --git a/map/map_five.cub b/map/map_five.cub
index d5c3361..e52646c 100644
--- a/map/map_five.cub
+++ b/map/map_five.cub
@@ -1,11 +1,11 @@
 R 1440 1000
-NO ./media/img/BRIQUASSES.xpm
-SO ./media/img/BRIQUASSES.xpm
-WE ./media/img/BRIQUASSES.xpm
-EA ./media/img/BRIQUASSES.xpm
+NO ./media/img/tex/BRIQUASSES.xpm
+SO ./media/img/tex/BRIQUASSES.xpm
+WE ./media/img/tex/BRIQUASSES.xpm
+EA ./media/img/tex/BRIQUASSES.xpm
 
-S ./media/img/crapaud.xpm
-F ./media/img/terre.xpm
+S ./media/img/tex/crapaud.xpm
+F ./media/img/tex/terre.xpm
 C 225,30,0
 
 LT ./media/img/linuz.xpm
diff --git a/map/map_four.cub b/map/map_four.cub
index 2c9a894..8f4443b 100644
--- a/map/map_four.cub
+++ b/map/map_four.cub
@@ -1,10 +1,10 @@
 R 1600 1100
 
-NO ./media/img/larry_world.xpm
-SO ./media/img/larry_world.xpm
-EA ./media/img/larry_world.xpm
-WE ./media/img/larry_world.xpm
-S ./media/img/larry.xpm
+NO ./media/img/tex/larry_world.xpm
+SO ./media/img/tex/larry_world.xpm
+EA ./media/img/tex/larry_world.xpm
+WE ./media/img/tex/larry_world.xpm
+S ./media/img/sprites/larry.xpm
 
 C 26,165,204
 F 24,170,25
diff --git a/map/map_one.cub b/map/map_one.cub
index 6123a8d..39c6fdc 100644
--- a/map/map_one.cub
+++ b/map/map_one.cub
@@ -1,17 +1,17 @@
 R 1600 1000
 
-NO ./media/img/wood_wall_1.xpm
-SO ./media/img/wood_wall_1.xpm
-EA ./media/img/wood_wall_1.xpm
-WE ./media/img/wood_wall_1.xpm
-S ./media/img/pillar.xpm
+NO ./media/img/tex/wood_wall_1.xpm
+SO ./media/img/tex/wood_wall_1.xpm
+EA ./media/img/tex/wood_wall_1.xpm
+WE ./media/img/tex/wood_wall_1.xpm
+S ./media/img/sprites/pillar.xpm
 
-C ./media/img/wood_ceil.xpm
-F ./media/img/parquet.xpm
+C ./media/img/tex/wood_ceil.xpm
+F ./media/img/tex/parquet.xpm
 
-S3 ./media/img/pylon.xpm
-S4 ./media/img/larry.xpm
-S5 ./media/img/wood_chest.xpm
+S3 ./media/img/sprites/pylon.xpm
+S4 ./media/img/sprites/larry.xpm
+S5 ./media/img/sprites/wood_chest.xpm
 
 
 T ./media/img/spikes.xpm
diff --git a/map/map_six.cub b/map/map_six.cub
index b58fc40..985a13a 100644
--- a/map/map_six.cub
+++ b/map/map_six.cub
@@ -1,13 +1,13 @@
 R 1600 1000
 
-NO ./media/img/salad.xpm
-SO ./media/img/linuz.xpm
-EA ./media/img/crapaud.xpm
-WE ./media/img/feelsbadman.xpm
-S ./media/img/arrow1.xpm
+NO ./media/img/tex/salad.xpm
+SO ./media/img/tex/linuz.xpm
+EA ./media/img/tex/crapaud.xpm
+WE ./media/img/tex/feelsbadman.xpm
+S ./media/img/tex/arrow1.xpm
 
-C ./media/img/osef.xpm
-F ./media/img/arrow1.xpm
+C ./media/img/tex/osef.xpm
+F ./media/img/tex/arrow1.xpm
 
 SH 14
 
diff --git a/map/map_three.cub b/map/map_three.cub
index b8c6ea3..5b84682 100644
--- a/map/map_three.cub
+++ b/map/map_three.cub
@@ -1,14 +1,14 @@
 R 1000 720
 
-NO ./media/img/BRIQUASSES.xpm
-SO ./media/img/BRIQUASSES.xpm
-EA ./media/img/BRIQUASSES.xpm
-WE ./media/img/left_arrow.xpm
-S ./media/img/hey.xpm
+NO ./media/img/tex/BRIQUASSES.xpm
+SO ./media/img/tex/BRIQUASSES.xpm
+EA ./media/img/tex/BRIQUASSES.xpm
+WE ./media/img/tex/left_arrow.xpm
+S ./media/img/sprites/hey.xpm
 
 SH 0
-C ./media/img/BRIQUASSES.xpm
-F ./media/img/BRIQUASSES.xpm
+C ./media/img/tex/BRIQUASSES.xpm
+F ./media/img/tex/BRIQUASSES.xpm
 
 SH 4
 
diff --git a/map/map_two.cub b/map/map_two.cub
index 0d3b1ff..9300699 100644
--- a/map/map_two.cub
+++ b/map/map_two.cub
@@ -1,16 +1,16 @@
 R 1280 800
 
-NO ./media/img/linuz.xpm
-SO ./media/img/linuz.xpm
-EA ./media/img/linuz.xpm
-WE ./media/img/linuz.xpm
-S ./media/img/pillar.xpm
-S3 ./media/img/pillar.xpm
-S4 ./media/img/pillar.xpm
+NO ./media/img/tex/linuz.xpm
+SO ./media/img/tex/linuz.xpm
+EA ./media/img/tex/linuz.xpm
+WE ./media/img/tex/linuz.xpm
+S ./media/img/sprites/pillar.xpm
+S3 ./media/img/sprites/pillar.xpm
+S4 ./media/img/sprites/pillar.xpm
 
 SH 5
-C ./media/img/arrow1.xpm
-F ./media/img/arrow2.xpm
+C ./media/img/tex/arrow1.xpm
+F ./media/img/tex/arrow2.xpm
 
 111111111111111111111111111111111111
 100000000000000000000000000000000001
diff --git a/media/img/death_screen.xpm b/media/img/screens/death_screen.xpm
index a941dcf..a941dcf 100644
--- a/media/img/death_screen.xpm
+++ b/media/img/screens/death_screen.xpm
diff --git a/media/img/normal_sky.xpm b/media/img/skybox/normal_sky.xpm
index 743e0c3..743e0c3 100644
--- a/media/img/normal_sky.xpm
+++ b/media/img/skybox/normal_sky.xpm
diff --git a/media/img/hey.xpm b/media/img/sprites/hey.xpm
index 7f3e1ed..7f3e1ed 100644
--- a/media/img/hey.xpm
+++ b/media/img/sprites/hey.xpm
diff --git a/media/img/larry.xpm b/media/img/sprites/larry.xpm
index 58d93c2..58d93c2 100644
--- a/media/img/larry.xpm
+++ b/media/img/sprites/larry.xpm
diff --git a/media/img/linus.xpm b/media/img/sprites/linus.xpm
index fcc8d07..fcc8d07 100644
--- a/media/img/linus.xpm
+++ b/media/img/sprites/linus.xpm
diff --git a/media/img/pillar.xpm b/media/img/sprites/pillar.xpm
index 4a0c656..4a0c656 100644
--- a/media/img/pillar.xpm
+++ b/media/img/sprites/pillar.xpm
diff --git a/media/img/pylon.xpm b/media/img/sprites/pylon.xpm
index 5c89d60..5c89d60 100644
--- a/media/img/pylon.xpm
+++ b/media/img/sprites/pylon.xpm
diff --git a/media/img/spikes.xpm b/media/img/sprites/spikes.xpm
index 2aef2ea..2aef2ea 100644
--- a/media/img/spikes.xpm
+++ b/media/img/sprites/spikes.xpm
diff --git a/media/img/wood_chest.xpm b/media/img/sprites/wood_chest.xpm
index a7b5d8d..a7b5d8d 100644
--- a/media/img/wood_chest.xpm
+++ b/media/img/sprites/wood_chest.xpm
diff --git a/media/img/BRIQUASSES.xpm b/media/img/tex/BRIQUASSES.xpm
index 04a3e2b..04a3e2b 100644
--- a/media/img/BRIQUASSES.xpm
+++ b/media/img/tex/BRIQUASSES.xpm
diff --git a/media/img/BRIQUASSES_2.xpm b/media/img/tex/BRIQUASSES_2.xpm
index c2d1e06..c2d1e06 100644
--- a/media/img/BRIQUASSES_2.xpm
+++ b/media/img/tex/BRIQUASSES_2.xpm
diff --git a/media/img/BRIQUASSE_3.xpm b/media/img/tex/BRIQUASSE_3.xpm
index cd56455..cd56455 100644
--- a/media/img/BRIQUASSE_3.xpm
+++ b/media/img/tex/BRIQUASSE_3.xpm
diff --git a/media/img/MURLOL.xpm b/media/img/tex/MURLOL.xpm
index d8fcd2c..d8fcd2c 100644
--- a/media/img/MURLOL.xpm
+++ b/media/img/tex/MURLOL.xpm
diff --git a/media/img/arrow1.xpm b/media/img/tex/arrow1.xpm
index db701f9..db701f9 100644
--- a/media/img/arrow1.xpm
+++ b/media/img/tex/arrow1.xpm
diff --git a/media/img/arrow2.xpm b/media/img/tex/arrow2.xpm
index a6ff821..a6ff821 100644
--- a/media/img/arrow2.xpm
+++ b/media/img/tex/arrow2.xpm
diff --git a/media/img/arrow3.xpm b/media/img/tex/arrow3.xpm
index 7f7b4d9..7f7b4d9 100644
--- a/media/img/arrow3.xpm
+++ b/media/img/tex/arrow3.xpm
diff --git a/media/img/arrow4.xpm b/media/img/tex/arrow4.xpm
index 2c874a4..2c874a4 100644
--- a/media/img/arrow4.xpm
+++ b/media/img/tex/arrow4.xpm
diff --git a/media/img/arrow5.xpm b/media/img/tex/arrow5.xpm
index 8de8948..8de8948 100644
--- a/media/img/arrow5.xpm
+++ b/media/img/tex/arrow5.xpm
diff --git a/media/img/brickwall.xpm b/media/img/tex/brickwall.xpm
index 30ef012..30ef012 100644
--- a/media/img/brickwall.xpm
+++ b/media/img/tex/brickwall.xpm
diff --git a/media/img/cowtits.xpm b/media/img/tex/cowtits.xpm
index 843d9b4..843d9b4 100644
--- a/media/img/cowtits.xpm
+++ b/media/img/tex/cowtits.xpm
diff --git a/media/img/crapaud.xpm b/media/img/tex/crapaud.xpm
index 68c580d..68c580d 100644
--- a/media/img/crapaud.xpm
+++ b/media/img/tex/crapaud.xpm
diff --git a/media/img/feelsbadman.xpm b/media/img/tex/feelsbadman.xpm
index ca22702..ca22702 100644
--- a/media/img/feelsbadman.xpm
+++ b/media/img/tex/feelsbadman.xpm
diff --git a/media/img/frde.xpm b/media/img/tex/frde.xpm
index 24207a7..24207a7 100644
--- a/media/img/frde.xpm
+++ b/media/img/tex/frde.xpm
diff --git a/media/img/ground.xpm b/media/img/tex/ground.xpm
index 9500ad8..9500ad8 100644
--- a/media/img/ground.xpm
+++ b/media/img/tex/ground.xpm
diff --git a/media/img/larry_world.xpm b/media/img/tex/larry_world.xpm
index 6c24bff..6c24bff 100644
--- a/media/img/larry_world.xpm
+++ b/media/img/tex/larry_world.xpm
diff --git a/media/img/left_arrow.xpm b/media/img/tex/left_arrow.xpm
index 45141de..45141de 100644
--- a/media/img/left_arrow.xpm
+++ b/media/img/tex/left_arrow.xpm
diff --git a/media/img/linuz.xpm b/media/img/tex/linuz.xpm
index 116e02b..116e02b 100644
--- a/media/img/linuz.xpm
+++ b/media/img/tex/linuz.xpm
diff --git a/media/img/osef.xpm b/media/img/tex/osef.xpm
index ca4337b..ca4337b 100644
--- a/media/img/osef.xpm
+++ b/media/img/tex/osef.xpm
diff --git a/media/img/parquet.xpm b/media/img/tex/parquet.xpm
index 95e1c6f..95e1c6f 100644
--- a/media/img/parquet.xpm
+++ b/media/img/tex/parquet.xpm
diff --git a/media/img/plate.xpm b/media/img/tex/plate.xpm
index 6be344b..6be344b 100644
--- a/media/img/plate.xpm
+++ b/media/img/tex/plate.xpm
diff --git a/media/img/plate_small.xpm b/media/img/tex/plate_small.xpm
index 4f42713..4f42713 100644
--- a/media/img/plate_small.xpm
+++ b/media/img/tex/plate_small.xpm
diff --git a/media/img/salad.xpm b/media/img/tex/salad.xpm
index a78e88b..a78e88b 100644
--- a/media/img/salad.xpm
+++ b/media/img/tex/salad.xpm
diff --git a/media/img/segfault2.xpm b/media/img/tex/segfault2.xpm
index 7c2b058..7c2b058 100644
--- a/media/img/segfault2.xpm
+++ b/media/img/tex/segfault2.xpm
diff --git a/media/img/segfot.xpm b/media/img/tex/segfot.xpm
index ec76624..ec76624 100644
--- a/media/img/segfot.xpm
+++ b/media/img/tex/segfot.xpm
diff --git a/media/img/segfot_small.xpm b/media/img/tex/segfot_small.xpm
index a7934ed..a7934ed 100644
--- a/media/img/segfot_small.xpm
+++ b/media/img/tex/segfot_small.xpm
diff --git a/media/img/terre.xpm b/media/img/tex/terre.xpm
index 4554732..4554732 100644
--- a/media/img/terre.xpm
+++ b/media/img/tex/terre.xpm
diff --git a/media/img/tex.xpm b/media/img/tex/tex.xpm
index 0b1acdd..0b1acdd 100644
--- a/media/img/tex.xpm
+++ b/media/img/tex/tex.xpm
diff --git a/media/img/wood_ceil.xpm b/media/img/tex/wood_ceil.xpm
index 737cd07..737cd07 100644
--- a/media/img/wood_ceil.xpm
+++ b/media/img/tex/wood_ceil.xpm
diff --git a/media/img/wood_wall_1.xpm b/media/img/tex/wood_wall_1.xpm
index eef0b15..eef0b15 100644
--- a/media/img/wood_wall_1.xpm
+++ b/media/img/tex/wood_wall_1.xpm