From c65b3f3acac4053a77f54c8bb41249a4f3ebd8e6 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 29 Jul 2019 21:59:59 -0400 Subject: [PATCH] Sound. --- core/assets/shoot.ogg | Bin 6869 -> 0 bytes core/src/io/anuke/mindustry/maps/Map.java | 2 ++ core/src/io/anuke/mindustry/type/Weapon.java | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 core/assets/shoot.ogg diff --git a/core/assets/shoot.ogg b/core/assets/shoot.ogg deleted file mode 100644 index 271e540dd975f68e5e86d4db330fb0828fc1b6e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6869 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 /** Returns the generation filters that this map uses on load.*/ public Array filters(){ + Log.info(build); if(build != -1 && build < 83 && tags.get("genfilters", "").isEmpty()){ return Array.with(); } diff --git a/core/src/io/anuke/mindustry/type/Weapon.java b/core/src/io/anuke/mindustry/type/Weapon.java index 0e0ccddbb8..789c883507 100644 --- a/core/src/io/anuke/mindustry/type/Weapon.java +++ b/core/src/io/anuke/mindustry/type/Weapon.java @@ -52,8 +52,6 @@ public class Weapon{ /** whether shooter rotation is ignored when shooting. */ public boolean ignoreRotation = false; - // public Sound sound = Core.audio.newSound(Core.files.internal("sounds/shoot.ogg")); - public TextureRegion region; protected Weapon(String name){ @@ -90,7 +88,6 @@ public class Weapon{ float baseX = shooter.getX(), baseY = shooter.getY(); Weapon weapon = shooter.getWeapon(); - //weapon.sound.play(1f); sequenceNum = 0; if(weapon.shotDelay > 0.01f){