From 96cfb51bd8b7501fbeb0f0fffaf60ca1b3155ae6 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 24 May 2018 13:30:56 -0400
Subject: [PATCH] Sprite changes

---
 .../blocks/turrets/{doubleturret.png => duo.png}    | Bin
 .../turrets/{gatlingturret.png => scatter.png}      | Bin
 .../{flameturret-shoot.png => scorch-shoot.png}     | Bin
 core/src/io/anuke/mindustry/core/Control.java       |   4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename core/assets-raw/sprites/blocks/turrets/{doubleturret.png => duo.png} (100%)
 rename core/assets-raw/sprites/blocks/turrets/{gatlingturret.png => scatter.png} (100%)
 rename core/assets-raw/sprites/blocks/turrets/{flameturret-shoot.png => scorch-shoot.png} (100%)

diff --git a/core/assets-raw/sprites/blocks/turrets/doubleturret.png b/core/assets-raw/sprites/blocks/turrets/duo.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/turrets/doubleturret.png
rename to core/assets-raw/sprites/blocks/turrets/duo.png
diff --git a/core/assets-raw/sprites/blocks/turrets/gatlingturret.png b/core/assets-raw/sprites/blocks/turrets/scatter.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/turrets/gatlingturret.png
rename to core/assets-raw/sprites/blocks/turrets/scatter.png
diff --git a/core/assets-raw/sprites/blocks/turrets/flameturret-shoot.png b/core/assets-raw/sprites/blocks/turrets/scorch-shoot.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/turrets/flameturret-shoot.png
rename to core/assets-raw/sprites/blocks/turrets/scorch-shoot.png
diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index 92a233da2c..ed3b31bc0d 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -91,7 +91,7 @@ public class Control extends Module{
 				"ping.mp3", "tesla.mp3", "waveend.mp3", "railgun.mp3", "blast.mp3", "bang2.mp3");
 
 		Sounds.setFalloff(9000f);
-		Sounds.setPlayer(((sound, volume) -> {
+		Sounds.setPlayer((sound, volume) -> {
 			long time = TimeUtils.millis();
 			long value = soundMap.get(sound, 0L);
 
@@ -99,7 +99,7 @@ public class Control extends Module{
 				threads.run(() -> sound.play(volume));
 				soundMap.put(sound, time);
 			}
-		}));
+		});
 
         Musics.load("1.mp3", "2.mp3", "3.mp3", "4.mp3", "5.mp3", "6.mp3");