diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-05-13 22:10:02 +0200 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-05-13 22:10:02 +0200 |
| commit | c65f691ec231a2e5cbdf1bdeca2db04d063115c5 (patch) | |
| tree | 2450cf130627933559e1fdb290942fa32ff40df9 | |
| parent | Fuckiest fucked bug fix (diff) | |
| download | 42-cub3d-c65f691ec231a2e5cbdf1bdeca2db04d063115c5.tar.gz 42-cub3d-c65f691ec231a2e5cbdf1bdeca2db04d063115c5.tar.bz2 42-cub3d-c65f691ec231a2e5cbdf1bdeca2db04d063115c5.tar.xz 42-cub3d-c65f691ec231a2e5cbdf1bdeca2db04d063115c5.tar.zst 42-cub3d-c65f691ec231a2e5cbdf1bdeca2db04d063115c5.zip | |
Added music to the main story
25 files changed, 45 insertions, 7 deletions
@@ -170,7 +170,7 @@ CFLAGS += -Wall CFLAGS += -Wextra CFLAGS += -Werror CFLAGS += -pedantic -# CFLAGS += -pthread +CFLAGS += -pthread #--------------------------------------------------------------------------------------------------# ifdef DEBUG CFLAGS += ${DBG} diff --git a/map/qst_eight_witch_house.cub b/map/qst_eight_witch_house.cub index 72f6bdb..b52fcdf 100644 --- a/map/qst_eight_witch_house.cub +++ b/map/qst_eight_witch_house.cub @@ -18,6 +18,8 @@ S7 media/img/sprites/table.xpm L map/qst_nine_cave_path.cub LT media/img/tex/witch_door.xpm +MU media/sound/noidan_tie.wav + T media/img/sprites/witch.xpm SH 4 diff --git a/map/qst_eighteen_corridor_rev.cub b/map/qst_eighteen_corridor_rev.cub index 1aed8e0..3e5c0f8 100644 --- a/map/qst_eighteen_corridor_rev.cub +++ b/map/qst_eighteen_corridor_rev.cub @@ -17,6 +17,8 @@ S7 media/img/sprites/longbow.xpm S8 media/img/sprites/swords.xpm S9 media/img/sprites/shield.xpm +MU media/sound/medieval_travelers.wav + L map/qst_end.cub LT media/img/tex/castle_door.xpm diff --git a/map/qst_eleven_cave.cub b/map/qst_eleven_cave.cub index ad4a9d2..359bad4 100644 --- a/map/qst_eleven_cave.cub +++ b/map/qst_eleven_cave.cub @@ -16,6 +16,8 @@ S6 media/img/sprites/big_rock.xpm T media/img/sprites/spikes.xpm +MU media/sound/noidan_tie.wav + L map/qst_twelve_dungeon_one.cub LT media/img/tex/dungeon_door.xpm diff --git a/map/qst_end.cub b/map/qst_end.cub index aae2236..b69b6cf 100644 --- a/map/qst_end.cub +++ b/map/qst_end.cub @@ -17,6 +17,8 @@ S7 media/img/sprites/longbow.xpm S8 media/img/sprites/treasure.xpm S9 media/img/sprites/shield.xpm +MU media/sound/medieval_travelers.wav + SH 1 diff --git a/map/qst_five_big_plain.cub b/map/qst_five_big_plain.cub index 2467653..3a063fc 100644 --- a/map/qst_five_big_plain.cub +++ b/map/qst_five_big_plain.cub @@ -13,6 +13,8 @@ S6 media/img/sprites/villager.xpm S7 media/img/sprites/knight.xpm S8 media/img/sprites/cow.xpm +MU media/sound/medieval_travelers.wav + C 133,210,255 F media/img/tex/ground_small.xpm diff --git a/map/qst_fivteen_big_plain_rev.cub b/map/qst_fivteen_big_plain_rev.cub index af90c35..6ab7b7c 100644 --- a/map/qst_fivteen_big_plain_rev.cub +++ b/map/qst_fivteen_big_plain_rev.cub @@ -16,6 +16,8 @@ S8 media/img/sprites/cow.xpm C 133,210,255 F media/img/tex/ground_small.xpm +MU media/sound/medieval_travelers.wav + L map/qst_sixteen_castle_out_rev.cub LT media/img/tex/castle_door.xpm @@ -32,7 +34,7 @@ SH 0 10002000000000000000000000000000000000000000000001 10000000000200000000000000000000000000000000300001 10000000000000000000000000000000000000000000000001 -10000000000000000000000N00000000000000000000000001 +10000000000000000000000000000000000000000000000001 10000000323000000000000000000000300000000020000001 10000080000000000000000000000000000000000000000001 10000880000000000300000000000000000000000000000001 @@ -51,7 +53,7 @@ SH 0 1000000000000000000000000000000000002001 1000000000000000000000000000000003000001 1000000000000000000000000000000000000001 - 1000000000000000000000000000000020003001 + 1000000000000N00000000000000000020003001 1000000000000000000000000000200000002001 1000000000000000000000000000000000000031 1111111111111111111111111111111111111111 diff --git a/map/qst_four_castle_out.cub b/map/qst_four_castle_out.cub index 12e8070..5cf2e43 100644 --- a/map/qst_four_castle_out.cub +++ b/map/qst_four_castle_out.cub @@ -15,6 +15,8 @@ S7 media/img/sprites/knight_dialogue.xpm C 133,210,255 F media/img/tex/ground_small.xpm +MU media/sound/medieval_travelers.wav + L map/qst_five_big_plain.cub LT media/img/tex/castle_door.xpm diff --git a/map/qst_fourteen_dungeon_three.cub b/map/qst_fourteen_dungeon_three.cub index 856dc70..f480ddf 100644 --- a/map/qst_fourteen_dungeon_three.cub +++ b/map/qst_fourteen_dungeon_three.cub @@ -1,4 +1,4 @@ -R 1300 1040 +R 10 10 NO media/img/tex/dungeon_wall.xpm SO media/img/tex/dungeon_wall.xpm @@ -17,6 +17,8 @@ S7 media/img/tex/dungeon_wall.xpm T media/img/sprites/circles.xpm +MU media/sound/boss.wav + L map/qst_fivteen_big_plain_rev.cub LT media/img/tex/castle_portal.xpm diff --git a/map/qst_nine_cave_path.cub b/map/qst_nine_cave_path.cub index 0f5c365..5233287 100644 --- a/map/qst_nine_cave_path.cub +++ b/map/qst_nine_cave_path.cub @@ -13,9 +13,13 @@ S5 media/img/sprites/bush.xpm C 133,210,255 F media/img/tex/earth.xpm +MU media/sound/noidan_tie.wav + L map/qst_ten_small_plain.cub LT media/img/tex/plain_three.xpm +SH 3 + 1111111 1300051 1000001111111111 diff --git a/map/qst_seven_witch_path.cub b/map/qst_seven_witch_path.cub index 8fc11fb..4041581 100644 --- a/map/qst_seven_witch_path.cub +++ b/map/qst_seven_witch_path.cub @@ -15,6 +15,8 @@ F media/img/tex/earth.xpm SH 3 +MU media/sound/noidan_tie.wav + L map/qst_eight_witch_house.cub LT media/img/tex/witch_door.xpm diff --git a/map/qst_seventeen_bridge_rev.cub b/map/qst_seventeen_bridge_rev.cub index 2f5737a..85c04c5 100644 --- a/map/qst_seventeen_bridge_rev.cub +++ b/map/qst_seventeen_bridge_rev.cub @@ -14,6 +14,8 @@ S6 media/img/sprites/brasero.xpm C 133,210,255 F media/img/tex/wood_wall_1_small.xpm +MU media/sound/medieval_travelers.wav + L map/qst_eighteen_corridor_rev.cub LT media/img/tex/castle_door.xpm diff --git a/map/qst_six_forest.cub b/map/qst_six_forest.cub index 0e3418b..9b06b61 100644 --- a/map/qst_six_forest.cub +++ b/map/qst_six_forest.cub @@ -18,6 +18,8 @@ F media/img/tex/earth.xpm L map/qst_seven_witch_path.cub LT media/img/tex/forest_path.xpm +MU media/sound/noidan_tie.wav + T media/img/sprites/bear_trap.xpm SH 3 diff --git a/map/qst_sixteen_castle_out_rev.cub b/map/qst_sixteen_castle_out_rev.cub index 6baa44c..b0c75e6 100644 --- a/map/qst_sixteen_castle_out_rev.cub +++ b/map/qst_sixteen_castle_out_rev.cub @@ -15,6 +15,8 @@ S7 media/img/sprites/knight_end_dialogue.xpm C 133,210,255 F media/img/tex/ground_small.xpm +MU media/sound/medieval_travelers.wav + L map/qst_seventeen_bridge_rev.cub LT media/img/tex/castle_door.xpm diff --git a/map/qst_ten_small_plain.cub b/map/qst_ten_small_plain.cub index 4f6db41..888e53c 100644 --- a/map/qst_ten_small_plain.cub +++ b/map/qst_ten_small_plain.cub @@ -14,6 +14,8 @@ S6 media/img/sprites/big_rock.xpm C 133,210,255 F media/img/tex/ground_small.xpm +MU media/sound/noidan_tie.wav + L map/qst_eleven_cave.cub LT media/img/tex/cave_entrance.xpm diff --git a/map/qst_thirteen_dungeon_two.cub b/map/qst_thirteen_dungeon_two.cub index b861f71..285b6bd 100644 --- a/map/qst_thirteen_dungeon_two.cub +++ b/map/qst_thirteen_dungeon_two.cub @@ -17,6 +17,8 @@ S7 media/img/tex/dungeon_wall.xpm T media/img/sprites/circles.xpm +MU media/sound/ritual_of_negation.wav + L map/qst_fourteen_dungeon_three.cub LT media/img/tex/dungeon_door_boss.xpm diff --git a/map/qst_three_bridge.cub b/map/qst_three_bridge.cub index 5ade73f..9aff045 100644 --- a/map/qst_three_bridge.cub +++ b/map/qst_three_bridge.cub @@ -14,6 +14,8 @@ S6 media/img/sprites/brasero.xpm C 133,210,255 F media/img/tex/wood_wall_1_small.xpm +MU media/sound/medieval_travelers.wav + L map/qst_four_castle_out.cub LT media/img/tex/bridge_door.xpm diff --git a/map/qst_twelve_dungeon_one.cub b/map/qst_twelve_dungeon_one.cub index c466c93..f7ad2d0 100644 --- a/map/qst_twelve_dungeon_one.cub +++ b/map/qst_twelve_dungeon_one.cub @@ -14,6 +14,8 @@ S4 media/img/sprites/chains.xpm T media/img/sprites/circles.xpm +MU media/sound/ritual_of_negation.wav + L map/qst_thirteen_dungeon_two.cub LT media/img/tex/dungeon_door_in.xpm diff --git a/map/qst_two_corridor.cub b/map/qst_two_corridor.cub index d636fdc..34a2443 100644 --- a/map/qst_two_corridor.cub +++ b/map/qst_two_corridor.cub @@ -17,6 +17,8 @@ S7 media/img/sprites/longbow.xpm S8 media/img/sprites/swords.xpm S9 media/img/sprites/shield.xpm +MU media/sound/medieval_travelers.wav + L map/qst_three_bridge.cub LT media/img/tex/castle_door.xpm diff --git a/map/quest_start.cub b/map/quest_start.cub index 41b5c45..08ad883 100644 --- a/map/quest_start.cub +++ b/map/quest_start.cub @@ -17,6 +17,8 @@ S7 media/img/sprites/longbow.xpm S8 media/img/sprites/swords.xpm S9 media/img/sprites/shield.xpm +MU media/sound/medieval_travelers.wav + L map/qst_two_corridor.cub LT media/img/tex/castle_door.xpm diff --git a/media/sound/boss.wav b/media/sound/boss.wav Binary files differnew file mode 100644 index 0000000..fdf6615 --- /dev/null +++ b/media/sound/boss.wav diff --git a/media/sound/medieval_travelers.wav b/media/sound/medieval_travelers.wav Binary files differnew file mode 100644 index 0000000..61b76d5 --- /dev/null +++ b/media/sound/medieval_travelers.wav diff --git a/media/sound/noidan_tie.wav b/media/sound/noidan_tie.wav Binary files differnew file mode 100644 index 0000000..9a58853 --- /dev/null +++ b/media/sound/noidan_tie.wav diff --git a/media/sound/ritual_of_negation.wav b/media/sound/ritual_of_negation.wav Binary files differnew file mode 100644 index 0000000..385e242 --- /dev/null +++ b/media/sound/ritual_of_negation.wav diff --git a/src/ft_click_close.c b/src/ft_click_close.c index 113c241..6ed7b37 100644 --- a/src/ft_click_close.c +++ b/src/ft_click_close.c @@ -19,7 +19,5 @@ int ft_click_close(int keycode, t_cub *clist) { (void)keycode; - (void)clist; - exit(0); - return (0); + return (ft_exit(0, clist)); } |