mainmenu: use entrypoint's runtime to show running time (fixes #180)

This commit is contained in:
yugecin 2018-07-03 00:14:46 +02:00
parent 19937e2897
commit c67b96d3dc
No known key found for this signature in database
GPG Key ID: 2C5AC035A7068E44

View File

@ -48,6 +48,7 @@ import org.newdawn.slick.Image;
import org.newdawn.slick.Input; import org.newdawn.slick.Input;
import org.newdawn.slick.util.Log; import org.newdawn.slick.util.Log;
import yugecin.opsudance.core.Constants; import yugecin.opsudance.core.Constants;
import yugecin.opsudance.core.Entrypoint;
import yugecin.opsudance.core.state.BaseOpsuState; import yugecin.opsudance.core.state.BaseOpsuState;
import yugecin.opsudance.core.state.OpsuState; import yugecin.opsudance.core.state.OpsuState;
@ -118,9 +119,6 @@ public class MainMenu extends BaseOpsuState {
private int textTopMarginY; private int textTopMarginY;
private int textLineHeight; private int textLineHeight;
/** Application start time, for drawing the total running time. */
private long programStartTime;
/** Indexes of previous songs. */ /** Indexes of previous songs. */
private Stack<Integer> previous; private Stack<Integer> previous;
@ -152,7 +150,6 @@ public class MainMenu extends BaseOpsuState {
@Override @Override
protected void revalidate() { protected void revalidate() {
programStartTime = System.currentTimeMillis();
previous = new Stack<>(); previous = new Stack<>();
final int width = displayContainer.width; final int width = displayContainer.width;
@ -419,11 +416,10 @@ public class MainMenu extends BaseOpsuState {
BeatmapSetList.get().getMapSetCount() BeatmapSetList.get().getMapSetCount()
); );
g.drawString(txt, textMarginX, textTopMarginY); g.drawString(txt, textMarginX, textTopMarginY);
final long runningTime = System.currentTimeMillis() - programStartTime;
txt = String.format( txt = String.format(
"%s has been running for %s.", "%s has been running for %s.",
Constants.PROJECT_NAME, Constants.PROJECT_NAME,
Utils.getTimeString((int) (runningTime) / 1000) Utils.getTimeString((int) (Entrypoint.runtime() / 1000L))
); );
g.drawString(txt, textMarginX, textTopMarginY + textLineHeight); g.drawString(txt, textMarginX, textTopMarginY + textLineHeight);
txt = String.format( txt = String.format(