From 2d2052e39f63050ac9cf55f4a1a2a82ea3f14de0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 27 Sep 2021 11:00:33 -0400 Subject: [PATCH] "ok" --- core/assets-raw/sprites/units/antumbra.png | Bin 7559 -> 6405 bytes core/src/mindustry/audio/SoundControl.java | 2 ++ core/src/mindustry/game/EventType.java | 2 ++ 3 files changed, 4 insertions(+) diff --git a/core/assets-raw/sprites/units/antumbra.png b/core/assets-raw/sprites/units/antumbra.png index 10af20cfb977e37c43b6c32e6b4bd0e6b81e570b..bbbcb480fe751340e4f2c5ee0c41a2ba904e8f64 100644 GIT binary patch literal 6405 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 P7#KWV{an^LB{Ts5?b_>& literal 7559 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 diff --git a/core/src/mindustry/audio/SoundControl.java b/core/src/mindustry/audio/SoundControl.java index d407198f94..1441f42832 100644 --- a/core/src/mindustry/audio/SoundControl.java +++ b/core/src/mindustry/audio/SoundControl.java @@ -76,6 +76,8 @@ public class SoundControl{ sound.setBus(uiBus); } } + + Events.fire(new MusicRegisterEvent()); } public void loop(Sound sound, float volume){ diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java index 66bc472c6f..91055acf87 100644 --- a/core/src/mindustry/game/EventType.java +++ b/core/src/mindustry/game/EventType.java @@ -70,6 +70,8 @@ public class EventType{ public static class ContentInitEvent{} /** Called when the client game is first loaded. */ public static class ClientLoadEvent{} + /** Called after SoundControl registers its music. */ + public static class MusicRegisterEvent{} /** Called *after* all the modded files have been added into Vars.tree */ public static class FileTreeInitEvent{} /** Called when a game begins and the world is loaded. */