Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into knorkemergingsliders

Browse Source
This commit is contained in:
yugecin
2016-12-04 16:22:15 +01:00
parent 06445e59c4 fb9565ffa9
commit 33f018bf0f
7 changed files with 345 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/itdelatrisu/opsu/states/OptionsMenu.java
View File

@@ -113,6 +113,10 @@ public class OptionsMenu extends BasicGameState {
}),
DANCE ("Dance", new GameOption[] {
GameOption.DANCE_MOVER,
GameOption.DANCE_QUAD_BEZ_AGGRESSIVENESS,
GameOption.DANCE_QUAD_BEZ_SLIDER_AGGRESSIVENESS_FACTOR,
GameOption.DANCE_QUAD_BEZ_USE_CUBIC_ON_SLIDERS,
GameOption.DANCE_QUAD_BEZ_CUBIC_AGGRESSIVENESS_FACTOR,
GameOption.DANCE_MOVER_DIRECTION,
GameOption.DANCE_SLIDER_MOVER_TYPE,
GameOption.DANCE_SPINNER,
@@ -277,9 +281,12 @@ public class OptionsMenu extends BasicGameState {
if (selectedOption != null) {
hoverOption = selectedOption;
}
for (int i = 0; i < currentTab.options.length; i++) {
for (int i = 0, j = 0; i < currentTab.options.length; i++) {
GameOption option = currentTab.options[i];
drawOption(option, i, hoverOption == option);
if (!option.showCondition()) {
continue;
}
drawOption(option, j++, hoverOption == option);
}
// option tabs
@@ -602,6 +609,14 @@ public class OptionsMenu extends BasicGameState {
if (index >= currentTab.options.length)
return null;
return currentTab.options[index];
for (GameOption option : currentTab.options) {
if (option.showCondition()) {
index--;
}
if (index < 0) {
return option;
}
}
return null;
}
}