diff --git a/res/selection-selectoptions-over.png b/res/selection-selectoptions-over.png deleted file mode 100644 index 27af71de..00000000 Binary files a/res/selection-selectoptions-over.png and /dev/null differ diff --git a/res/selection-selectoptions.png b/res/selection-selectoptions.png deleted file mode 100644 index ab60811f..00000000 Binary files a/res/selection-selectoptions.png and /dev/null differ 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;