From ad71b5dd2e663b49f94c8b9490b5aed3f8557c48 Mon Sep 17 00:00:00 2001 From: yugecin Date: Sun, 22 Jul 2018 22:13:29 +0200 Subject: [PATCH] songmenu: remove old button that opens options menu (ctrl+o does this) --- res/selection-selectoptions-over.png | Bin 5248 -> 0 bytes res/selection-selectoptions.png | Bin 3665 -> 0 bytes src/itdelatrisu/opsu/GameImage.java | 2 -- src/itdelatrisu/opsu/states/SongMenu.java | 15 +-------------- 4 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 res/selection-selectoptions-over.png delete mode 100644 res/selection-selectoptions.png diff --git a/res/selection-selectoptions-over.png b/res/selection-selectoptions-over.png deleted file mode 100644 index 27af71de9e6adf747c4e24a8906acdaa7fc83c13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5248 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 diff --git a/res/selection-selectoptions.png b/res/selection-selectoptions.png deleted file mode 100644 index ab60811ff57c36faced34a3fd62343c651e3ba2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3665 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 CH`eU{ diff --git a/src/itdelatrisu/opsu/GameImage.java b/src/itdelatrisu/opsu/GameImage.java index cc864eb0..06bed0f1 100644 --- a/src/itdelatrisu/opsu/GameImage.java +++ b/src/itdelatrisu/opsu/GameImage.java @@ -238,8 +238,6 @@ public enum GameImage { SELECTION_RANDOM_OVERLAY ("selection-random-over", "png", false, false), SELECTION_OPTIONS ("selection-options", "png", false, false), SELECTION_OPTIONS_OVERLAY ("selection-options-over", "png", false, false), - SELECTION_OTHER_OPTIONS ("selection-selectoptions", "png", false, false), - SELECTION_OTHER_OPTIONS_OVERLAY ("selection-selectoptions-over", "png", false, false), // Replay Speed Buttons REPLAY_PLAYBACK_NORMAL ("playback-normal", "png", false, false), diff --git a/src/itdelatrisu/opsu/states/SongMenu.java b/src/itdelatrisu/opsu/states/SongMenu.java index 731428ca..350c13b1 100644 --- a/src/itdelatrisu/opsu/states/SongMenu.java +++ b/src/itdelatrisu/opsu/states/SongMenu.java @@ -160,7 +160,7 @@ public class SongMenu extends ComplexOpsuState { private BeatmapSetNode hoverIndex = null; /** The selection buttons. */ - private MenuButton selectModsButton, selectRandomButton, selectMapOptionsButton, selectOptionsButton; + private MenuButton selectModsButton, selectRandomButton, selectMapOptionsButton; /** The search textfield. */ private TextField searchTextField; @@ -418,12 +418,9 @@ public class SongMenu extends ComplexOpsuState { selectX + selectOffset, selectY); selectMapOptionsButton = new MenuButton(GameImage.SELECTION_OPTIONS_OVERLAY.getImage(), selectX + selectOffset * 2f, selectY); - selectOptionsButton = new MenuButton(GameImage.SELECTION_OTHER_OPTIONS_OVERLAY.getImage(), - selectX + selectOffset * 3f, selectY); selectModsButton.setHoverFade(0f); selectRandomButton.setHoverFade(0f); selectMapOptionsButton.setHoverFade(0f); - selectOptionsButton.setHoverFade(0f); // loader int loaderDim = GameImage.MENU_MUSICNOTE.getWidth(); @@ -629,8 +626,6 @@ public class SongMenu extends ComplexOpsuState { selectRandomButton.draw(); GameImage.SELECTION_OPTIONS.getImage().drawCentered(selectMapOptionsButton.getX(), selectMapOptionsButton.getY()); selectMapOptionsButton.draw(); - GameImage.SELECTION_OTHER_OPTIONS.getImage().drawCentered(selectOptionsButton.getX(), selectOptionsButton.getY()); - selectOptionsButton.draw(); // group tabs BeatmapGroup currentGroup = BeatmapGroup.current(); @@ -733,7 +728,6 @@ public class SongMenu extends ComplexOpsuState { selectModsButton.hoverUpdate(delta, mouseX, mouseY); selectRandomButton.hoverUpdate(delta, mouseX, mouseY); selectMapOptionsButton.hoverUpdate(delta, mouseX, mouseY); - selectOptionsButton.hoverUpdate(delta, mouseX, mouseY); footerLogoButton.hoverUpdate(delta, mouseX, mouseY, 0.25f); // beatmap menu timer @@ -927,12 +921,6 @@ public class SongMenu extends ComplexOpsuState { } else if (selectMapOptionsButton.contains(x, y)) { this.keyPressed(KEY_F3, '\0'); return true; - } else if (selectOptionsButton.contains(x, y)) { - if (!optionsOverlay.isActive()) { - SoundController.playSound(SoundEffect.MENUHIT); - optionsOverlay.show(); - } - return true; } // group tabs @@ -1277,7 +1265,6 @@ public class SongMenu extends ComplexOpsuState { selectModsButton.resetHover(); selectRandomButton.resetHover(); selectMapOptionsButton.resetHover(); - selectOptionsButton.resetHover(); hoverOffset.setTime(0); hoverIndex = null; isScrollingToFocusNode = false;