diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index d90efcee44..e77d092af1 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -183,7 +183,7 @@ public class DesktopInput extends InputHandler{ boolean panCam = false; float camSpeed = (!Core.input.keyDown(Binding.boost) ? panSpeed : panBoostSpeed) * Time.delta; - if(input.keyDown(Binding.pan)){ + if(input.keyDown(Binding.pan) && !scene.hasField() && !scene.hasDialog()){ panCam = true; panning = true; } @@ -193,7 +193,7 @@ public class DesktopInput extends InputHandler{ } //TODO awful UI state checking code - if(((player.dead() || state.isPaused()) && !ui.chatfrag.shown()) && (!scene.hasField() && !scene.hasDialog())){ + if(((player.dead() || state.isPaused()) && !ui.chatfrag.shown()) && !scene.hasField() && !scene.hasDialog()){ if(input.keyDown(Binding.mouse_move)){ panCam = true; } diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 0fea8bae81..b9bc5670ef 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -92,7 +92,7 @@ public class ContentParser{ if(Vars.headless) return new MockSound(); String name = "sounds/" + data.asString(); - String path = Vars.tree.get(name + ".ogg").exists() && !Vars.ios ? name + ".ogg" : name + ".mp3"; + String path = Vars.tree.get(name + ".ogg").exists() ? name + ".ogg" : name + ".mp3"; if(Core.assets.contains(path, Sound.class)) return Core.assets.get(path, Sound.class); ModLoadingSound sound = new ModLoadingSound(); diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index bd7a73a34a..94622e6aaa 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -90,7 +90,7 @@ public class Scripts implements Disposable{ if(Vars.headless) return new MockSound(); String name = "sounds/" + soundName; - String path = Vars.tree.get(name + ".ogg").exists() && !Vars.ios ? name + ".ogg" : name + ".mp3"; + String path = Vars.tree.get(name + ".ogg").exists() ? name + ".ogg" : name + ".mp3"; if(Core.assets.contains(path, Sound.class)) return Core.assets.get(path, Sound.class); ModLoadingSound sound = new ModLoadingSound(); @@ -105,7 +105,7 @@ public class Scripts implements Disposable{ if(Vars.headless) return new MockMusic(); String name = "music/" + soundName; - String path = Vars.tree.get(name + ".ogg").exists() && !Vars.ios ? name + ".ogg" : name + ".mp3"; + String path = Vars.tree.get(name + ".ogg").exists() ? name + ".ogg" : name + ".mp3"; if(Core.assets.contains(path, Music.class)) return Core.assets.get(path, Music.class); ModLoadingMusic sound = new ModLoadingMusic();