diff --git a/core/assets/shoot.ogg b/core/assets/shoot.ogg deleted file mode 100644 index 271e540dd9..0000000000 Binary files a/core/assets/shoot.ogg and /dev/null differ diff --git a/core/src/io/anuke/mindustry/maps/Map.java b/core/src/io/anuke/mindustry/maps/Map.java index 89165b14c8..a9d619b599 100644 --- a/core/src/io/anuke/mindustry/maps/Map.java +++ b/core/src/io/anuke/mindustry/maps/Map.java @@ -4,6 +4,7 @@ import io.anuke.arc.Core; import io.anuke.arc.collection.*; import io.anuke.arc.files.FileHandle; import io.anuke.arc.graphics.Texture; +import io.anuke.arc.util.*; import io.anuke.mindustry.Vars; import io.anuke.mindustry.game.*; import io.anuke.mindustry.io.JsonIO; @@ -71,6 +72,7 @@ public class Map implements Comparable{ /** 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){