diff --git a/src/com/reco1l/osu/data/Beatmaps.kt b/src/com/reco1l/osu/data/Beatmaps.kt index 6118a9921..ed3f89bea 100644 --- a/src/com/reco1l/osu/data/Beatmaps.kt +++ b/src/com/reco1l/osu/data/Beatmaps.kt @@ -205,19 +205,25 @@ data class BeatmapInfo( * The `.osu` file path. */ val path - get() = "${Config.getBeatmapPath()}$setDirectory/$filename" + get() = "${absoluteSetDirectory}/$filename" /** * The audio file path. */ val audioPath - get() = "${Config.getBeatmapPath()}$setDirectory/$audioFilename" + get() = "${absoluteSetDirectory}/$audioFilename" /** * The background file path. */ val backgroundPath - get() = "${Config.getBeatmapPath()}$setDirectory/$backgroundFilename" + get() = "${absoluteSetDirectory}/$backgroundFilename" + + /** + * The beatmap set path ([setDirectory]) with [Config.getBeatmapPath] prepended. + */ + val absoluteSetDirectory + get() = "${Config.getBeatmapPath()}$setDirectory" /** * The total hit object count. diff --git a/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java b/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java index 2ee9af63a..ed5f7e6e0 100644 --- a/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java +++ b/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java @@ -288,7 +288,7 @@ private void setBackground() { videoStarted = false; videoOffset = playableBeatmap.getEvents().videoStartTime / 1000f; - video = new VideoSprite(lastBeatmapInfo.getSetDirectory() + "/" + playableBeatmap.getEvents().videoFilename, engine); + video = new VideoSprite(lastBeatmapInfo.getAbsoluteSetDirectory() + "/" + playableBeatmap.getEvents().videoFilename, engine); video.setAlpha(0f); bgSprite = video;