aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozanLeClerc <bousset.rudy@gmail.com>2020-03-22 20:25:16 +0100
committerJozanLeClerc <bousset.rudy@gmail.com>2020-03-22 20:25:16 +0100
commitb6affbc84100d0afdd33d194d3053f069f6039a2 (patch)
treee86bc620fa2712ac90103584d6881e6634fbcd87
parentDone with gimping (diff)
download42-cub3d-b6affbc84100d0afdd33d194d3053f069f6039a2.tar.gz
42-cub3d-b6affbc84100d0afdd33d194d3053f069f6039a2.tar.bz2
42-cub3d-b6affbc84100d0afdd33d194d3053f069f6039a2.tar.xz
42-cub3d-b6affbc84100d0afdd33d194d3053f069f6039a2.tar.zst
42-cub3d-b6affbc84100d0afdd33d194d3053f069f6039a2.zip
We got three weaps
-rw-r--r--inc/cub3d_defines.h4
-rw-r--r--map/map_one.cub14
-rw-r--r--media/sound/sfx/double_b_fire.wavbin0 -> 112400 bytes
-rw-r--r--media/sound/sfx/double_b_load.wavbin0 -> 46024 bytes
4 files changed, 9 insertions, 9 deletions
diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h
index 3a1d2f4..33916d2 100644
--- a/inc/cub3d_defines.h
+++ b/inc/cub3d_defines.h
@@ -106,8 +106,8 @@ enum
# define FT_SFX_W_ONE_FIRE_PATH "./media/sound/sfx/sword_fire.wav"
# define FT_SFX_W_TWO_LOAD_PATH "./media/sound/sfx/colt_load.wav"
# define FT_SFX_W_TWO_FIRE_PATH "./media/sound/sfx/colt_fire.wav"
-# define FT_SFX_W_THREE_LOAD_PATH "./media/sound/sfx/colt_load.wav"
-# define FT_SFX_W_THREE_FIRE_PATH "./media/sound/sfx/colt_fire.wav"
+# define FT_SFX_W_THREE_LOAD_PATH "./media/sound/sfx/double_b_load.wav"
+# define FT_SFX_W_THREE_FIRE_PATH "./media/sound/sfx/double_b_fire.wav"
# 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_SPR_PATH "./media/img/weapons/sword_s.xpm"
diff --git a/map/map_one.cub b/map/map_one.cub
index d860088..b11ff6d 100644
--- a/map/map_one.cub
+++ b/map/map_one.cub
@@ -18,11 +18,11 @@ SH 2
1111111
111111111111000001
-100000000+00222201
-10000E000T00333301
-100000000000444401
+100000000+00000301
+10000E000T00000301
+100000000000000301
100100000+00000001
-1011#0@0!111000001
+101100000111000001
111111111111110011
1000001 100001
1001001 100001
@@ -30,9 +30,9 @@ SH 2
111101111111110111
10000000110101011
12020202020000001
-10000000000000001
-10000000000000001
-10000000000000001
+1#000000000000001
+1@000000000000001
+1!000000000000001
12020202020000001
11000000110100011
11110111111101011
diff --git a/media/sound/sfx/double_b_fire.wav b/media/sound/sfx/double_b_fire.wav
new file mode 100644
index 0000000..36dd02b
--- /dev/null
+++ b/media/sound/sfx/double_b_fire.wav
Binary files differ
diff --git a/media/sound/sfx/double_b_load.wav b/media/sound/sfx/double_b_load.wav
new file mode 100644
index 0000000..fadd592
--- /dev/null
+++ b/media/sound/sfx/double_b_load.wav
Binary files differ