From 1dc71aaa7f3f5830ff59bce677720f6159192c99 Mon Sep 17 00:00:00 2001 From: fd Date: Tue, 17 Feb 2015 22:54:20 -0500 Subject: [PATCH] Merge quick bad fix --- src/itdelatrisu/opsu/states/OptionsMenu.java | 2 +- src/itdelatrisu/opsu/states/SongMenu.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/itdelatrisu/opsu/states/OptionsMenu.java b/src/itdelatrisu/opsu/states/OptionsMenu.java index f5906489..53beaee2 100644 --- a/src/itdelatrisu/opsu/states/OptionsMenu.java +++ b/src/itdelatrisu/opsu/states/OptionsMenu.java @@ -182,7 +182,7 @@ public class OptionsMenu extends BasicGameState { // game option coordinate modifiers textY = (int) (tabY + tabImage.getHeight()); - offsetY = (height - textY - GameImage.MENU_BACK.getImage().getHeight()) / maxOptionsScreen; + offsetY = (height - textY - GameImage.MENU_BACK.getAnimation(1).getHeight()) / maxOptionsScreen; } @Override diff --git a/src/itdelatrisu/opsu/states/SongMenu.java b/src/itdelatrisu/opsu/states/SongMenu.java index 9b7bf462..3153d141 100644 --- a/src/itdelatrisu/opsu/states/SongMenu.java +++ b/src/itdelatrisu/opsu/states/SongMenu.java @@ -69,7 +69,7 @@ import org.newdawn.slick.state.transition.FadeOutTransition; */ public class SongMenu extends BasicGameState { /** The max number of song buttons to be shown on each screen. */ - public static final int MAX_SONG_BUTTONS = 7; + public static final int MAX_SONG_BUTTONS = 6; /** The max number of score buttons to be shown at a time. */ public static final int MAX_SCORE_BUTTONS = 7; @@ -253,7 +253,7 @@ public class SongMenu extends BasicGameState { search.setMaxLength(60); // selection buttons - float selectX = GameImage.MENU_BACK.getImage().getWidth() * 1.75f; + float selectX = GameImage.MENU_BACK.getAnimation(1).getWidth() * 1.75f; float selectY = height - GameImage.SELECTION_MODS.getImage().getHeight() / 2f; float selectOffset = GameImage.SELECTION_MODS.getImage().getWidth() * 1.05f; selectModsButton = new MenuButton(GameImage.SELECTION_MODS_OVERLAY.getImage(),