Misc. bug fixes and improvements.
- Fixed Game not loading OsuFile for maps in a song group. (blame: 5612336)
- Implemented rotations for reverse arrows, and added a new one by Alic1a.
- "Auto" mod: pausing no longer requires click to unpause, and mod images are permanently drawn.
- Program now loads from Main Menu instead of Options (unnecessary complications for the sake of a transition).
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
@@ -363,6 +363,7 @@ public class SongMenu extends BasicGameState {
|
||||
if (sortTabs[i].contains(x, y)) {
|
||||
if (i != currentSort) {
|
||||
currentSort = i;
|
||||
SoundController.playSound(SoundController.SOUND_MENUCLICK);
|
||||
OsuGroupNode oldFocusBase = Opsu.groups.getBaseNode(focusNode.index);
|
||||
int oldFocusFileIndex = focusNode.osuFileIndex;
|
||||
focusNode = null;
|
||||
@@ -395,7 +396,7 @@ public class SongMenu extends BasicGameState {
|
||||
|
||||
} else if (node.osuFileIndex == focusNode.osuFileIndex) {
|
||||
// if already focused, load the beatmap
|
||||
startGame(focusNode.osuFiles.get(focusNode.osuFileIndex));
|
||||
startGame();
|
||||
|
||||
} else {
|
||||
// focus the node
|
||||
@@ -443,7 +444,7 @@ public class SongMenu extends BasicGameState {
|
||||
break;
|
||||
case Input.KEY_ENTER:
|
||||
if (focusNode != null)
|
||||
startGame(focusNode.osuFiles.get(focusNode.osuFileIndex));
|
||||
startGame();
|
||||
break;
|
||||
case Input.KEY_DOWN:
|
||||
changeIndex(1);
|
||||
@@ -595,11 +596,12 @@ public class SongMenu extends BasicGameState {
|
||||
* Starts the game.
|
||||
* @param osu the OsuFile to send to the game
|
||||
*/
|
||||
private void startGame(OsuFile osu) {
|
||||
private void startGame() {
|
||||
if (MusicController.isConverting())
|
||||
return;
|
||||
|
||||
SoundController.playSound(SoundController.SOUND_MENUHIT);
|
||||
OsuFile osu = MusicController.getOsuFile();
|
||||
Display.setTitle(String.format("%s - %s", game.getTitle(), osu.toString()));
|
||||
OsuParser.parseHitObjects(osu);
|
||||
SoundController.setSampleSet(osu.sampleSet);
|
||||
|
||||
Reference in New Issue
Block a user