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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 L!vz;dRuTAbt#Ikr 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){