Misc. bugfixes
This commit is contained in:
parent
4b76d2c3cf
commit
d7c980e0a4
|
@ -230,6 +230,7 @@ public class Opsu extends StateBasedGame {
|
|||
} else {
|
||||
if (id == STATE_GAME) {
|
||||
MusicController.pause();
|
||||
MusicController.setPitch(1.0f);
|
||||
MusicController.resume();
|
||||
} else
|
||||
songMenu.resetTrackOnLoad();
|
||||
|
|
|
@ -304,6 +304,16 @@ public class ScoreDB {
|
|||
* @return all scores for the beatmap, or null if any error occurred
|
||||
*/
|
||||
public static ScoreData[] getMapScores(Beatmap beatmap) {
|
||||
return getMapScores(beatmap, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the game scores for a beatmap while excluding a score.
|
||||
* @param beatmap the beatmap
|
||||
* @param exclude the filename of the score to exclude
|
||||
* @return all scores for the beatmap except for exclude, or null if any error occurred
|
||||
*/
|
||||
public static ScoreData[] getMapScores(Beatmap beatmap, String exclude) {
|
||||
if (connection == null)
|
||||
return null;
|
||||
|
||||
|
@ -317,7 +327,11 @@ public class ScoreDB {
|
|||
ResultSet rs = selectMapStmt.executeQuery();
|
||||
while (rs.next()) {
|
||||
ScoreData s = new ScoreData(rs);
|
||||
list.add(s);
|
||||
if (s.replayString != null && s.replayString.equals(exclude)) {
|
||||
// dont return this score
|
||||
} else {
|
||||
list.add(s);
|
||||
}
|
||||
}
|
||||
rs.close();
|
||||
} catch (SQLException e) {
|
||||
|
@ -326,7 +340,6 @@ public class ScoreDB {
|
|||
}
|
||||
return getSortedArray(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the game scores for a beatmap set.
|
||||
* @param beatmap the beatmap
|
||||
|
|
|
@ -1210,7 +1210,7 @@ public class Game extends BasicGameState {
|
|||
if (beatmap == null || beatmap.objects == null)
|
||||
throw new RuntimeException("Running game with no beatmap loaded.");
|
||||
// fetch previous results
|
||||
previousScores = ScoreDB.getMapScores(beatmap);
|
||||
previousScores = ScoreDB.getMapScores(beatmap, replay == null ? null : replay.getReplayFilename());
|
||||
lastRankUpdateTime = -1000;
|
||||
if (previousScores != null)
|
||||
currentRank = previousScores.length;
|
||||
|
|
Loading…
Reference in New Issue
Block a user