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

merge branch 'issue-010' into master (close #10)

Browse Source
This commit is contained in:
yugecin 2016-11-12 19:05:11 +01:00
commit a3659d7a7d
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,6 +308,9 @@ public class Game extends BasicGameState {
int width = container.getWidth(); int width = container.getWidth();
int height = container.getHeight(); int height = container.getHeight();
int trackPosition = MusicController.getPosition(); int trackPosition = MusicController.getPosition();
if (isLeadIn()) {
trackPosition -= leadInTime;
}
if (pauseTime > -1) // returning from pause screen if (pauseTime > -1) // returning from pause screen
trackPosition = pauseTime; trackPosition = pauseTime;
else if (deathTime > -1) // "Easy" mod: health bar increasing else if (deathTime > -1) // "Easy" mod: health bar increasing
@ -766,7 +769,13 @@ public class Game extends BasicGameState {
*/ */
private void updateGame(int mouseX, int mouseY, int delta, int trackPosition, int keys) { private void updateGame(int mouseX, int mouseY, int delta, int trackPosition, int keys) {
// map complete! // map complete!
if (objectIndex >= gameObjects.length || (MusicController.trackEnded() && objectIndex > 0)) { boolean complete = objectIndex >= gameObjects.length;
if (GameMod.AUTO.isActive() && complete) {
if (gameObjects.length > 0) {
complete = trackPosition >= gameObjects[gameObjects.length - 1].getEndTime() + 5000;
}
}
if (complete || (MusicController.trackEnded() && objectIndex > 0)) {
// track ended before last object was processed: force a hit result // track ended before last object was processed: force a hit result
if (MusicController.trackEnded() && objectIndex < gameObjects.length) if (MusicController.trackEnded() && objectIndex < gameObjects.length)
gameObjects[objectIndex].update(true, delta, mouseX, mouseY, false, trackPosition); gameObjects[objectIndex].update(true, delta, mouseX, mouseY, false, trackPosition);
@ -803,6 +812,10 @@ public class Game extends BasicGameState {
return; return;
} }
if (objectIndex >= gameObjects.length) {
return;
}
GameObject g = gameObjects[objectIndex]; GameObject g = gameObjects[objectIndex];
if ((g.isCircle() || g.isSlider()) && g.getTime() <= trackPosition) { if ((g.isCircle() || g.isSlider()) && g.getTime() <= trackPosition) {
Cursor.lastObjColor = g.getColor(); Cursor.lastObjColor = g.getColor();
@ -1347,6 +1360,12 @@ public class Game extends BasicGameState {
MusicController.setPitch(GameMod.getSpeedMultiplier()); MusicController.setPitch(GameMod.getSpeedMultiplier());
MusicController.pause(); MusicController.pause();
if (gameObjects.length > 0) {
int leadIntime = 2000 - gameObjects[0].getTime();
if (leadIntime > 0) {
this.leadInTime = Math.max(leadIntime, this.leadInTime);
}
}
SoundController.mute(false); SoundController.mute(false);
} }