Remove enemy shooting sfx.

alxm · May 24, 2018 · 2ee8293 · 2ee8293
1 parent 7f5fc0c
commit 2ee8293
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 19 deletions.
diff --git a/DefendPluto/generated/data_sfx_enemy_shoot.h b/DefendPluto/generated/data_sfx_enemy_shoot.h
diff --git a/DefendPluto/obj_enemy.c b/DefendPluto/obj_enemy.c
@@ -107,8 +107,6 @@ static void shoot(ZEnemy* Enemy, uint8_t Angle, bool ExtraSpeed)
                        Angle,
                        ExtraSpeed,
                        g_data[Enemy->typeId].damage);
-
-        z_sfx_play(Z_SFX_ENEMY_SHOOT);
     }
 }
 

diff --git a/DefendPluto/util_sound.c b/DefendPluto/util_sound.c
@@ -21,7 +21,6 @@
 #if !Z_PLATFORM_ARDUBOY
 #include "generated/data_sfx_enemy_die.h"
 #include "generated/data_sfx_enemy_hurt.h"
-#include "generated/data_sfx_enemy_shoot.h"
 #include "generated/data_sfx_level_complete.h"
 #include "generated/data_sfx_level_lost.h"
 #include "generated/data_sfx_level_won.h"
@@ -40,7 +39,6 @@ void z_sound_setup(void)
 {
     z_sfx_load(Z_SFX_ENEMY_DIE, enemy_die);
     z_sfx_load(Z_SFX_ENEMY_HURT, enemy_hurt);
-    z_sfx_load(Z_SFX_ENEMY_SHOOT, enemy_shoot);
     z_sfx_load(Z_SFX_LEVEL_COMPLETE, level_complete);
     z_sfx_load(Z_SFX_LEVEL_LOST, level_lost);
     z_sfx_load(Z_SFX_LEVEL_WON, level_won);

diff --git a/DefendPluto/util_sound.h b/DefendPluto/util_sound.h
@@ -23,7 +23,6 @@ typedef enum Z_ENUM_PACK {
     Z_SFX_INVALID = -1,
     Z_SFX_ENEMY_DIE,
     Z_SFX_ENEMY_HURT,
-    Z_SFX_ENEMY_SHOOT,
     Z_SFX_LEVEL_COMPLETE,
     Z_SFX_LEVEL_LOST,
     Z_SFX_LEVEL_WON,

diff --git a/assets/sfx/enemy_shoot.wav b/assets/sfx/enemy_shoot.wav
-Original file line number
+Diff line change
@@ Expand Up @@
                            Angle,
                            ExtraSpeed,
                            g_data[Enemy->typeId].damage);
-            z_sfx_play(Z_SFX_ENEMY_SHOOT);
         }
     }
@@ Expand Down @@