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

Minor updates and code improvements.

Browse Source 
- MusicController.getPosition() now returns time even when track is paused. (e.g. song progress bar in main menu won't reset when paused)
- Force unpause track when entering the song menu.
- Rewrote Game.RESTART_* constants as enums.
- Cleaned up logo play/exit button scaling.
- MainMenu.previous is now non-static.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han
2015-01-15 00:56:30 -05:00
parent 03095733df
commit b856e2924c
7 changed files with 70 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/itdelatrisu/opsu/states/Game.java
View File

@@ -61,11 +61,12 @@ public class Game extends BasicGameState {
/**
* Game restart states.
*/
public static final byte
RESTART_FALSE = 0,
RESTART_NEW = 1, // first time loading song
RESTART_MANUAL = 2, // retry
RESTART_LOSE = 3; // health is zero: no-continue/force restart
public enum Restart {
FALSE, // no restart
NEW, // first time loading song
MANUAL, // retry
LOSE; // health is zero: no-continue/force restart
}
/**
* Minimum time before start of song, in milliseconds, to process skip-related actions.
@@ -120,7 +121,7 @@ public class Game extends BasicGameState {
/**
* Current restart state.
*/
private byte restart;
private Restart restart;
/**
* Current break index in breaks ArrayList.
@@ -570,7 +571,7 @@ public class Game extends BasicGameState {
}
// game over, force a restart
restart = RESTART_LOSE;
restart = Restart.LOSE;
game.enterState(Opsu.STATE_GAMEPAUSEMENU);
}
@@ -638,7 +639,7 @@ public class Game extends BasicGameState {
try {
if (trackPosition < osu.objects[0].getTime())
retries--; // don't count this retry (cancel out later increment)
restart = RESTART_MANUAL;
restart = Restart.MANUAL;
enter(container, game);
skipIntro();
} catch (SlickException e) {
@@ -664,7 +665,7 @@ public class Game extends BasicGameState {
if (checkpoint == 0 || checkpoint > osu.endTime)
break; // invalid checkpoint
try {
restart = RESTART_MANUAL;
restart = Restart.MANUAL;
enter(container, game);
checkpointLoaded = true;
if (isLeadIn()) {
@@ -740,7 +741,7 @@ public class Game extends BasicGameState {
@Override
public void enter(GameContainer container, StateBasedGame game)
throws SlickException {
if (restart == RESTART_NEW)
if (restart == Restart.NEW)
osu = MusicController.getOsuFile();
if (osu == null || osu.objects == null)
@@ -750,9 +751,9 @@ public class Game extends BasicGameState {
// container.setMouseGrabbed(true);
// restart the game
if (restart != RESTART_FALSE) {
if (restart != Restart.FALSE) {
// new game
if (restart == RESTART_NEW) {
if (restart == Restart.NEW) {
loadImages();
setMapModifiers();
retries = 0;
@@ -816,7 +817,7 @@ public class Game extends BasicGameState {
}
leadInTime = osu.audioLeadIn + approachTime;
restart = RESTART_FALSE;
restart = Restart.FALSE;
}
skipButton.setScale(1f);
@@ -944,8 +945,8 @@ public class Game extends BasicGameState {
/**
* Sets/returns whether entering the state will restart it.
*/
public void setRestart(byte restart) { this.restart = restart; }
public byte getRestart() { return restart; }
public void setRestart(Restart restart) { this.restart = restart; }
public Restart getRestart() { return restart; }
/**
* Returns whether or not the track is in the lead-in time state.