Skip to content

Commit

Permalink
Merge branch 'upstream-master' into new-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
Rian8337 committed Dec 26, 2024
2 parents e28c630 + a5e02c8 commit 9f18d7f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/com/reco1l/osu/UpdateManager.kt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ object UpdateManager: IFileRequestObserver
/**
* Check for new game updates.
*
* @param silently If `true` no announce will be shown unless there's new updates.
* @param silently If `true`, no prompts will be shown unless there's new updates.
*/
@JvmStatic
fun checkNewUpdates(silently: Boolean) {
Expand Down
8 changes: 4 additions & 4 deletions src/com/reco1l/osu/ui/PromptDialog.kt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ open class PromptDialog : MessageDialog() {
}

/**
* The text to be show displayed in the input hint.
* The text to display in the input hint.
*/
var hint: String? = null
set(value) {
Expand All @@ -52,7 +52,7 @@ open class PromptDialog : MessageDialog() {
}

/**
* The function to be called when the text input is changed.
* The function to call when the text input is changed.
*/
var onTextChanged: ((PromptDialog) -> Unit)? = null

Expand Down Expand Up @@ -92,15 +92,15 @@ open class PromptDialog : MessageDialog() {
}

/**
* The text to be show displayed in the input hint.
* The text to display in the input hint.
*/
fun setHint(text: String): PromptDialog {
hint = text
return this
}

/**
* The function to be called when the text input is changed.
* The function to call when the text input is changed.
*/
fun setOnTextChanged(action: (PromptDialog) -> Unit): PromptDialog {
onTextChanged = action
Expand Down
5 changes: 4 additions & 1 deletion src/ru/nsu/ccfit/zuev/osu/online/OnlineManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ public static OnlineManager getInstance() {
}

public static String getReplayURL(int playID) {
return endpoint + "upload/" + playID + ".odr";
return switch (Config.getBeatmapLeaderboardScoringMode()) {
case SCORE -> endpoint + "upload/" + playID + ".odr";
case PP -> endpoint + "bestpp/" + playID + ".odr";
};
}

public void init() {
Expand Down

0 comments on commit 9f18d7f

Please sign in to comment.