diff --git a/TJAPlayer3/Songs/CDTX.cs b/TJAPlayer3/Songs/CDTX.cs index fe17cb3d..03e01c02 100644 --- a/TJAPlayer3/Songs/CDTX.cs +++ b/TJAPlayer3/Songs/CDTX.cs @@ -1335,6 +1335,8 @@ namespace TJAPlayer3 private int listBalloon_Expert_数値管理; private int listBalloon_Master_数値管理; + public string scenePreset; + public bool[] b譜面が存在する = new bool[(int)Difficulty.Total]; private string[] dlmtSpace = { " " }; @@ -5450,6 +5452,13 @@ namespace TJAPlayer3 this.SELECTBG = strCommandParam; } } + else if (strCommandName.Equals("SCENEPRESET")) + { + if (!string.IsNullOrEmpty(strCommandParam)) + { + this.scenePreset = strCommandParam; + } + } else if (strCommandName.Equals("DEMOSTART")) { //2015.04.10 kairera0467 diff --git a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drums背景.cs b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drums背景.cs index f6fcce9d..6eca3c63 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drums背景.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drums背景.cs @@ -145,7 +145,13 @@ namespace TJAPlayer3 && ((Dictionary)_ps).ContainsKey(TJAPlayer3.stage選曲.r確定された曲.strScenePreset)) ? ((Dictionary)_ps)[TJAPlayer3.stage選曲.r確定された曲.strScenePreset] : null; - + + if (_ps != null + && TJAPlayer3.DTX.scenePreset != null + && ((Dictionary)_ps).ContainsKey(TJAPlayer3.DTX.scenePreset)) // If currently selected song has valid SCENEPRESET metadata within TJA + { + preset = ((Dictionary)_ps)[TJAPlayer3.DTX.scenePreset]; + } Random random = new Random();