Fix 2P keys still active if difficulty select in 1 Player mode and separate the code for Mods icons

TJAPlayer3/Stages/05.SongSelect/CActSelect難易度選択画面.cs

@@ -250,7 +250,7 @@ namespace TJAPlayer3
                     }
                 }
 
-                if (!bSelect[1] && !bOption[1])
+                if (!bSelect[1] && !bOption[1] && TJAPlayer3.ConfigIni.nPlayerCount > 1)
                 {
                     if (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue2P))
                     {

TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs

@@ -236,25 +236,7 @@ namespace TJAPlayer3
                 //        this.txオプションパネル_特殊.t2D描画( CDTXMania.app.Device, 0, 300, new Rectangle( 0, 44, 162, 44 ) );
                 //}
 
-                #region [Mods]
+                ModIcons.tDisplayMods(114, 236 + i * 190, TJAPlayer3.GetActualPlayer(i));
-
-                // HS
-                var _vals = new int[]{ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 24, 29, 34, 39, 44, 49 };
-                int _i = -1;
-
-                for (int j = 0; j < _vals.Length; j++)
-                {
-                    if (TJAPlayer3.ConfigIni.nScrollSpeed[TJAPlayer3.GetActualPlayer(i)] >= _vals[j])
-                        _i = j;
-                    else
-                        break;
-                }
-
-                if (_i >= 0)
-                    TJAPlayer3.Tx.HiSp[_i]?.t2D描画(TJAPlayer3.app.Device, 114, 236 + i * 190);
-
-                #endregion
-
 
                 if (TJAPlayer3.Tx.Couse_Symbol[TJAPlayer3.stage選曲.n確定された曲の難易度[i]] != null)
                 {

TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TJAPlayer3
+{
+    class ModIcons
+    {
+        static public void tDisplayMods(int x, int y, int player)
+        {
+            tDisplayHSIcon(x, y, player);
+        }
+
+        static private void tDisplayHSIcon(int x, int y, int player)
+        {
+            var _vals = new int[] { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 24, 29, 34, 39, 44, 49 };
+            int _i = -1;
+
+            for (int j = 0; j < _vals.Length; j++)
+            {
+                if (TJAPlayer3.ConfigIni.nScrollSpeed[player] >= _vals[j])
+                    _i = j;
+                else
+                    break;
+            }
+
+            if (_i >= 0)
+                TJAPlayer3.Tx.HiSp[_i]?.t2D描画(TJAPlayer3.app.Device, x, y);
+        } 
+
+    }
+}

TJAPlayer3/TJAPlayer3.csproj

@@ -268,6 +268,7 @@
     <Compile Include="Stages\07.Game\Taiko\FlyingNotes.cs" />
     <Compile Include="Stages\07.Game\Taiko\LaneFlash.cs" />
     <Compile Include="Character\PuchiChara.cs" />
+    <Compile Include="Stages\07.Game\Taiko\ModIcons.cs" />
     <Compile Include="Stages\07.Game\Taiko\Rainbow.cs" />
     <Compile Include="Stages\07.Game\Taiko\CAct演奏DrumsチップファイアD.cs" />
     <Compile Include="Stages\07.Game\CAct演奏PauseMenu.cs" />