Enabled application restarts.
- Pressing Ctrl+Shift+F5 in the options menu restarts the game. Beatmaps and sounds are not reloaded. - Use GameContainer.setForceExit(false) to trigger a restart after exiting. Other changes: - Fixed general issues with track pausing/pause states. - Store all background images loaded in OsuFiles in a static hash table, instead of in individual objects. This allows easier access to the allocated memory. - Only delete OSZ files if they were unzipped. (They were previously deleted in all cases.) - Moved more images (mods, playfield, lighting) into GameImage. - Moved OsuHitObject initialization inside Utils. Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
@@ -165,12 +165,6 @@ public class Game extends BasicGameState {
|
||||
*/
|
||||
private float pausePulse;
|
||||
|
||||
/**
|
||||
* Default playfield background (optional).
|
||||
* Overridden by song background unless "ForceDefaultPlayfield" option enabled.
|
||||
*/
|
||||
private Image playfield;
|
||||
|
||||
/**
|
||||
* Whether a checkpoint has been loaded during this game.
|
||||
*/
|
||||
@@ -214,13 +208,6 @@ public class Game extends BasicGameState {
|
||||
// create the associated GameScore object
|
||||
score = new GameScore(width, height);
|
||||
((GameRanking) game.getState(Opsu.STATE_GAMERANKING)).setGameScore(score);
|
||||
|
||||
// playfield background
|
||||
try {
|
||||
playfield = new Image("playfield.png").getScaledCopy(width, height);
|
||||
} catch (Exception e) {
|
||||
// optional
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -232,10 +219,8 @@ public class Game extends BasicGameState {
|
||||
// background
|
||||
g.setBackground(Color.black);
|
||||
float dimLevel = Options.getBackgroundDim();
|
||||
if (Options.isDefaultPlayfieldForced() && playfield != null) {
|
||||
playfield.setAlpha(dimLevel);
|
||||
playfield.draw();
|
||||
} else if (!osu.drawBG(width, height, dimLevel) && playfield != null) {
|
||||
if (Options.isDefaultPlayfieldForced() || !osu.drawBG(width, height, dimLevel)) {
|
||||
Image playfield = GameImage.PLAYFIELD.getImage();
|
||||
playfield.setAlpha(dimLevel);
|
||||
playfield.draw();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user