OSDN Git Service

#23580のコミット漏れをコミット。ikanickさんの修正以上に色々手を入れてました。こちらを使ってください。ごめんなさい。
authoryyagi <yyagi@16f42ceb-6dc6-49c8-ba94-f2d53467949d>
Fri, 7 Jan 2011 14:33:43 +0000 (14:33 +0000)
committeryyagi <yyagi@16f42ceb-6dc6-49c8-ba94-f2d53467949d>
Fri, 7 Jan 2011 14:33:43 +0000 (14:33 +0000)
それともう一つ修正あり。

#23921 Fix to mute multiple HO sounds with single HC.
複数の種類のHO音が同時になっていた場合に、HCでこれらを消音できていなかった問題を修正。

git-svn-id: http://svn.osdn.jp/svnroot/dtxmania/trunk@55 16f42ceb-6dc6-49c8-ba94-f2d53467949d

DTXManiaプロジェクト/コード/ステージ/07.演奏/ギター画面/CStage演奏ギター画面.cs
DTXManiaプロジェクト/コード/ステージ/07.演奏/ドラム画面/CStage演奏ドラム画面.cs

index 87df842..15a01fc 100644 (file)
@@ -206,6 +206,7 @@ namespace DTXMania
                        base.On活性化();\r
                        this.tステータスパネルの選択();\r
                        this.tパネル文字列の設定();\r
+\r
                        this.nInputAdjustTimeMs_Drums = CDTXMania.ConfigIni.nInputAdjustTimeMs.Drums;           // #23580 2011.1.3 yyagi\r
             this.nInputAdjustTimeMs_Guitar = CDTXMania.ConfigIni.nInputAdjustTimeMs.Guitar;            //        2011.1.7 ikanick 修正\r
                        this.nInputAdjustTimeMs_Bass = CDTXMania.ConfigIni.nInputAdjustTimeMs.Bass;                     //\r
@@ -563,9 +564,7 @@ namespace DTXMania
                private CTexture txチップ;\r
                private CTexture txヒットバー;\r
                private CTexture tx背景;\r
-               private int nInputAdjustTimeMs_Drums;           // #23580 2011.1.3 yyagi\r
-               private int nInputAdjustTimeMs_Guitar;          //\r
-               private int nInputAdjustTimeMs_Bass;            //\r
+               private STDGBVALUE<int> nInputAdjustTimeMs;             // #23580 2011.1.3 yyagi\r
 \r
                private E判定 e指定時刻からChipのJUDGEを返す( long nTime, CDTX.CChip pChip, int nInputAdjustTime )\r
                {\r
@@ -906,12 +905,12 @@ namespace DTXMania
                        switch (pChip.e楽器パート)\r
                        {\r
                                case E楽器パート.GUITAR:\r
-                                       eJudgeResult = this.e指定時刻からChipのJUDGEを返す(nHitTime, pChip, bIsAutoPlay ? 0 : this.nInputAdjustTimeMs_Guitar);\r
+                                       eJudgeResult = this.e指定時刻からChipのJUDGEを返す(nHitTime, pChip, bIsAutoPlay ? 0 : this.nInputAdjustTimeMs.Guitar);\r
                                        this.actJudgeString.Start(10, bIsAutoPlay ? E判定.Auto : eJudgeResult);\r
                                        break;\r
 \r
                                case E楽器パート.BASS:\r
-                                       eJudgeResult = this.e指定時刻からChipのJUDGEを返す(nHitTime, pChip, bIsAutoPlay ? 0 : this.nInputAdjustTimeMs_Bass);\r
+                                       eJudgeResult = this.e指定時刻からChipのJUDGEを返す(nHitTime, pChip, bIsAutoPlay ? 0 : this.nInputAdjustTimeMs.Bass);\r
                                        this.actJudgeString.Start(11, bIsAutoPlay ? E判定.Auto : eJudgeResult);\r
                                        break;\r
                        }\r
@@ -1232,8 +1231,9 @@ namespace DTXMania
                                }\r
                                else\r
                                {\r
-                                       int[] nInputAdjustTimes = new int[] { this.nInputAdjustTimeMs_Drums, this.nInputAdjustTimeMs_Guitar, this.nInputAdjustTimeMs_Bass };\r
-                                       nInputAdjustTime = nInputAdjustTimes[(int)pChip.e楽器パート];\r
+                                       //int[] nInputAdjustTimes = new int[] { this.nInputAdjustTimeMs.Drums, this.nInputAdjustTimeMs.Guitar, this.nInputAdjustTimeMs.Bass };\r
+                                       //nInputAdjustTime = nInputAdjustTimes[(int)pChip.e楽器パート];\r
+                                       nInputAdjustTime = this.nInputAdjustTimeMs[(int)pChip.e楽器パート];\r
                                }\r
                                \r
                                if( ( ( pChip.e楽器パート != E楽器パート.UNKNOWN ) && !pChip.bHit ) &&\r
@@ -2032,7 +2032,7 @@ namespace DTXMania
                                                        this.t入力メソッド記憶( E楽器パート.GUITAR );\r
                                                        long nTime = event2.nTimeStamp - CDTXMania.Timer.n前回リセットした時のシステム時刻;\r
                                                        CDTX.CChip pChip = this.r指定時刻に一番近い未ヒットChip( nTime, 0x2f );\r
-                                                       E判定 e判定 = this.e指定時刻からChipのJUDGEを返す(nTime, pChip, this.nInputAdjustTimeMs_Guitar);\r
+                                                       E判定 e判定 = this.e指定時刻からChipのJUDGEを返す(nTime, pChip, this.nInputAdjustTimeMs.Guitar);\r
                                                        if (((pChip != null) && ((pChip.nチャンネル番号 & 15) == num4)) && (e判定 != E判定.Miss))\r
                                                        {\r
                                                                if( ( num != 0 ) || ( num4 == 0 ) )\r
@@ -2165,7 +2165,7 @@ namespace DTXMania
                                                        this.t入力メソッド記憶( E楽器パート.BASS );\r
                                                        long nTime = event2.nTimeStamp - CDTXMania.Timer.n前回リセットした時のシステム時刻;\r
                                                        CDTX.CChip pChip = this.r指定時刻に一番近い未ヒットChip( nTime, 0xaf );\r
-                                                       E判定 e判定 = this.e指定時刻からChipのJUDGEを返す(nTime, pChip, this.nInputAdjustTimeMs_Bass);\r
+                                                       E判定 e判定 = this.e指定時刻からChipのJUDGEを返す(nTime, pChip, this.nInputAdjustTimeMs.Bass);\r
                                                        if (((pChip != null) && ((pChip.nチャンネル番号 & 15) == num4)) && (e判定 != E判定.Miss))\r
                                                        {\r
                                                                if( ( num != 0 ) || ( num4 == 0 ) )\r
index db11806..b11b056 100644 (file)
@@ -306,6 +306,7 @@ namespace DTXMania
                        base.On活性化();\r
                        this.tステータスパネルの選択();\r
                        this.tパネル文字列の設定();\r
+\r
                        this.nInputAdjustTimeMs_Drums = CDTXMania.ConfigIni.nInputAdjustTimeMs.Drums;           // #23580 2011.1.3 yyagi\r
                        this.nInputAdjustTimeMs_Guitar = CDTXMania.ConfigIni.nInputAdjustTimeMs.Guitar;         //        2011.1.7 ikanick 修正\r
                        this.nInputAdjustTimeMs_Bass = CDTXMania.ConfigIni.nInputAdjustTimeMs.Bass;                     //\r
@@ -652,9 +653,7 @@ namespace DTXMania
                private CTexture txヒットバーGB;\r
                private CTexture txレーンフレームGB;\r
                private CTexture tx背景;\r
-               private int nInputAdjustTimeMs_Drums;           // #23580 2011.1.3 yyagi\r
-               private int nInputAdjustTimeMs_Guitar;          //\r
-               private int nInputAdjustTimeMs_Bass;            //\r
+               private STDGBVALUE<int> nInputAdjustTimeMs;                     // #23580 2011.1.3 yyagi\r
                private bool bフィルイン区間の最後のChipである( CDTX.CChip pChip )\r
                {\r
                        if( pChip == null )\r
@@ -1153,17 +1152,17 @@ namespace DTXMania
                        switch (pChip.e楽器パート)\r
                        {\r
                                case E楽器パート.DRUMS:\r
-                                       eJudgeResult = this.e指定時刻からChipのJUDGEを返す(nHitTime, pChip, bIsAutoPlay? 0 : this.nInputAdjustTimeMs_Drums);\r
+                                       eJudgeResult = this.e指定時刻からChipのJUDGEを返す(nHitTime, pChip, bIsAutoPlay? 0 : this.nInputAdjustTimeMs.Drums);\r
                                        this.actJudgeString.Start(this.nチャンネル0Atoレーン07[pChip.nチャンネル番号 - 0x11], bIsAutoPlay ? E判定.Auto : eJudgeResult);\r
                                        break;\r
 \r
                                case E楽器パート.GUITAR:\r
-                                       eJudgeResult = this.e指定時刻からChipのJUDGEを返す(nHitTime, pChip, bIsAutoPlay? 0 : this.nInputAdjustTimeMs_Guitar);\r
+                                       eJudgeResult = this.e指定時刻からChipのJUDGEを返す(nHitTime, pChip, bIsAutoPlay? 0 : this.nInputAdjustTimeMs.Guitar);\r
                                        this.actJudgeString.Start(10, bIsAutoPlay ? E判定.Auto : eJudgeResult);\r
                                        break;\r
 \r
                                case E楽器パート.BASS:\r
-                                       eJudgeResult = this.e指定時刻からChipのJUDGEを返す(nHitTime, pChip, bIsAutoPlay? 0 : this.nInputAdjustTimeMs_Bass);\r
+                                       eJudgeResult = this.e指定時刻からChipのJUDGEを返す(nHitTime, pChip, bIsAutoPlay? 0 : this.nInputAdjustTimeMs.Bass);\r
                                        this.actJudgeString.Start(11, bIsAutoPlay ? E判定.Auto : eJudgeResult);\r
                                        break;\r
                        }\r
@@ -1344,7 +1343,7 @@ namespace DTXMania
                        {\r
                                return false;\r
                        }\r
-                       E判定 e判定 = this.e指定時刻からChipのJUDGEを返す( nHitTime, pChip, nInputAdjustTimeMs_Drums );\r
+                       E判定 e判定 = this.e指定時刻からChipのJUDGEを返す( nHitTime, pChip, nInputAdjustTimeMs.Drums );\r
                        if( e判定 == E判定.Miss )\r
                        {\r
                                return false;\r
@@ -1683,8 +1682,9 @@ namespace DTXMania
                                }\r
                                else\r
                                {\r
-                                       int[] nInputAdjustTimes = new int[] { this.nInputAdjustTimeMs_Drums, this.nInputAdjustTimeMs_Guitar, this.nInputAdjustTimeMs_Bass };\r
-                                       nInputAdjustTime = nInputAdjustTimes[(int)pChip.e楽器パート];\r
+                                       // int[] nInputAdjustTimes = new int[] { this.nInputAdjustTimeMs_Drums, this.nInputAdjustTimeMs_Guitar, this.nInputAdjustTimeMs_Bass };\r
+                                       // nInputAdjustTime = nInputAdjustTimes[(int)pChip.e楽器パート];\r
+                                       nInputAdjustTime = this.nInputAdjustTimeMs[(int)pChip.e楽器パート];\r
                                }\r
                                if( ( ( pChip.e楽器パート != E楽器パート.UNKNOWN ) && !pChip.bHit ) &&\r
                                        ( ( pChip.nバーからの距離dot.Drums < 0 ) && ( this.e指定時刻からChipのJUDGEを返す( CDTXMania.Timer.n現在時刻, pChip, nInputAdjustTime ) == E判定.Miss ) ) )\r
@@ -2742,7 +2742,7 @@ namespace DTXMania
                                                        }\r
                                                        long nTime = event2.nTimeStamp - CDTXMania.Timer.n前回リセットした時のシステム時刻;\r
                                                        CDTX.CChip pChip = this.r指定時刻に一番近い未ヒットChip( nTime, 0x2f );\r
-                                                       E判定 e判定 = this.e指定時刻からChipのJUDGEを返す( nTime, pChip, this.nInputAdjustTimeMs_Guitar );\r
+                                                       E判定 e判定 = this.e指定時刻からChipのJUDGEを返す( nTime, pChip, this.nInputAdjustTimeMs.Guitar );\r
                                                        if( ( ( pChip != null ) && ( ( pChip.nチャンネル番号 & 15 ) == num4 ) ) && ( e判定 != E判定.Miss ) )\r
                                                        {\r
                                                                if( ( num != 0 ) || ( num4 == 0 ) )\r
@@ -2880,42 +2880,42 @@ namespace DTXMania
                                                                if( event2.nVelocity <= CDTXMania.ConfigIni.nハイハット切り捨て下限Velocity )\r
                                                                        continue;       // 電子ドラムによる意図的なクロストークを無効にする\r
 \r
-                                                               CDTX.CChip chip1 = this.r指定時刻に一番近い未ヒットChip( nTime, 0x11 );    // HiHat Close\r
-                                                               CDTX.CChip chip2 = this.r指定時刻に一番近い未ヒットChip( nTime, 0x18 );    // HiHat Open\r
-                                                               CDTX.CChip chip3 = this.r指定時刻に一番近い未ヒットChip( nTime, 0x1a );    // LC\r
-                                                               E判定 e判定1 = (chip1 != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chip1, this.nInputAdjustTimeMs_Drums) : E判定.Miss;\r
-                                                               E判定 e判定2 = (chip2 != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chip2, this.nInputAdjustTimeMs_Drums) : E判定.Miss;\r
-                                                               E判定 e判定3 = (chip3 != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chip3, this.nInputAdjustTimeMs_Drums) : E判定.Miss;\r
+                                                               CDTX.CChip chipHC = this.r指定時刻に一番近い未ヒットChip( nTime, 0x11 );   // HiHat Close\r
+                                                               CDTX.CChip chipHO = this.r指定時刻に一番近い未ヒットChip( nTime, 0x18 );   // HiHat Open\r
+                                                               CDTX.CChip chipLC = this.r指定時刻に一番近い未ヒットChip( nTime, 0x1a );   // LC\r
+                                                               E判定 e判定HC = (chipHC != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chipHC, this.nInputAdjustTimeMs.Drums) : E判定.Miss;\r
+                                                               E判定 e判定HO = (chipHO != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chipHO, this.nInputAdjustTimeMs.Drums) : E判定.Miss;\r
+                                                               E判定 e判定LC = (chipLC != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chipLC, this.nInputAdjustTimeMs.Drums) : E判定.Miss;\r
                                                                switch( eHHGroup )\r
                                                                {\r
                                                                        case EHHGroup.ハイハットのみ打ち分ける:\r
                                                                                #region [ *** ]\r
                                                                                //-----------------------------\r
-                                                                               if( ( e判定1 != E判定.Miss ) && ( e判定3 != E判定.Miss ) )\r
+                                                                               if( ( e判定HC != E判定.Miss ) && ( e判定LC != E判定.Miss ) )\r
                                                                                {\r
-                                                                                       if( chip1.n発声位置 < chip3.n発声位置 )\r
+                                                                                       if( chipHC.n発声位置 < chipLC.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip1, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHC, event2.nVelocity );\r
                                                                                        }\r
-                                                                                       else if( chip1.n発声位置 > chip3.n発声位置 )\r
+                                                                                       else if( chipHC.n発声位置 > chipLC.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip3, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipLC, event2.nVelocity );\r
                                                                                        }\r
                                                                                        else\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip1, event2.nVelocity );\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip3, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHC, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipLC, event2.nVelocity );\r
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定1 != E判定.Miss )\r
+                                                                               else if( e判定HC != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chip1, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chipHC, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定3 != E判定.Miss )\r
+                                                                               else if( e判定LC != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chip3, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chipLC, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
                                                                                if( !flag )\r
@@ -2927,31 +2927,31 @@ namespace DTXMania
                                                                        case EHHGroup.左シンバルのみ打ち分ける:\r
                                                                                #region [ *** ]\r
                                                                                //-----------------------------\r
-                                                                               if( ( e判定1 != E判定.Miss ) && ( e判定2 != E判定.Miss ) )\r
+                                                                               if( ( e判定HC != E判定.Miss ) && ( e判定HO != E判定.Miss ) )\r
                                                                                {\r
-                                                                                       if( chip1.n発声位置 < chip2.n発声位置 )\r
+                                                                                       if( chipHC.n発声位置 < chipHO.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip1, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHC, event2.nVelocity );\r
                                                                                        }\r
-                                                                                       else if( chip1.n発声位置 > chip2.n発声位置 )\r
+                                                                                       else if( chipHC.n発声位置 > chipHO.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip2, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHO, event2.nVelocity );\r
                                                                                        }\r
                                                                                        else\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip1, event2.nVelocity );\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip2, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHC, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHO, event2.nVelocity );\r
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定1 != E判定.Miss )\r
+                                                                               else if( e判定HC != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chip1, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chipHC, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定2 != E判定.Miss )\r
+                                                                               else if( e判定HO != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chip2, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chipHO, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
                                                                                if( !flag )\r
@@ -2963,10 +2963,10 @@ namespace DTXMania
                                                                        case EHHGroup.全部共通:\r
                                                                                #region [ *** ]\r
                                                                                //-----------------------------\r
-                                                                               if( ( ( e判定1 != E判定.Miss ) && ( e判定2 != E判定.Miss ) ) && ( e判定3 != E判定.Miss ) )\r
+                                                                               if( ( ( e判定HC != E判定.Miss ) && ( e判定HO != E判定.Miss ) ) && ( e判定LC != E判定.Miss ) )\r
                                                                                {\r
                                                                                        CDTX.CChip chip4;\r
-                                                                                       CDTX.CChip[] chipArray = new CDTX.CChip[] { chip1, chip2, chip3 };\r
+                                                                                       CDTX.CChip[] chipArray = new CDTX.CChip[] { chipHC, chipHO, chipLC };\r
                                                                                        if( chipArray[ 1 ].n発声位置 > chipArray[ 2 ].n発声位置 )\r
                                                                                        {\r
                                                                                                chip4 = chipArray[ 1 ];\r
@@ -2996,70 +2996,70 @@ namespace DTXMania
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( ( e判定1 != E判定.Miss ) && ( e判定2 != E判定.Miss ) )\r
+                                                                               else if( ( e判定HC != E判定.Miss ) && ( e判定HO != E判定.Miss ) )\r
                                                                                {\r
-                                                                                       if( chip1.n発声位置 < chip2.n発声位置 )\r
+                                                                                       if( chipHC.n発声位置 < chipHO.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip1, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHC, event2.nVelocity );\r
                                                                                        }\r
-                                                                                       else if( chip1.n発声位置 > chip2.n発声位置 )\r
+                                                                                       else if( chipHC.n発声位置 > chipHO.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip2, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHO, event2.nVelocity );\r
                                                                                        }\r
                                                                                        else\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip1, event2.nVelocity );\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip2, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHC, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHO, event2.nVelocity );\r
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( ( e判定1 != E判定.Miss ) && ( e判定3 != E判定.Miss ) )\r
+                                                                               else if( ( e判定HC != E判定.Miss ) && ( e判定LC != E判定.Miss ) )\r
                                                                                {\r
-                                                                                       if( chip1.n発声位置 < chip3.n発声位置 )\r
+                                                                                       if( chipHC.n発声位置 < chipLC.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip1, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHC, event2.nVelocity );\r
                                                                                        }\r
-                                                                                       else if( chip1.n発声位置 > chip3.n発声位置 )\r
+                                                                                       else if( chipHC.n発声位置 > chipLC.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip3, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipLC, event2.nVelocity );\r
                                                                                        }\r
                                                                                        else\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip1, event2.nVelocity );\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip3, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHC, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipLC, event2.nVelocity );\r
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( ( e判定2 != E判定.Miss ) && ( e判定3 != E判定.Miss ) )\r
+                                                                               else if( ( e判定HO != E判定.Miss ) && ( e判定LC != E判定.Miss ) )\r
                                                                                {\r
-                                                                                       if( chip2.n発声位置 < chip3.n発声位置 )\r
+                                                                                       if( chipHO.n発声位置 < chipLC.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip2, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHO, event2.nVelocity );\r
                                                                                        }\r
-                                                                                       else if( chip2.n発声位置 > chip3.n発声位置 )\r
+                                                                                       else if( chipHO.n発声位置 > chipLC.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip3, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipLC, event2.nVelocity );\r
                                                                                        }\r
                                                                                        else\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip2, event2.nVelocity );\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chip3, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipHO, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HH, chipLC, event2.nVelocity );\r
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定1 != E判定.Miss )\r
+                                                                               else if( e判定HC != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chip1, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chipHC, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定2 != E判定.Miss )\r
+                                                                               else if( e判定HO != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chip2, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chipHO, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定3 != E判定.Miss )\r
+                                                                               else if( e判定LC != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chip3, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chipLC, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
                                                                                if( !flag )\r
@@ -3071,9 +3071,9 @@ namespace DTXMania
                                                                        default:\r
                                                                                #region [ *** ]\r
                                                                                //-----------------------------\r
-                                                                               if( e判定1 != E判定.Miss )\r
+                                                                               if( e判定HC != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chip1, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HH, chipHC, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
                                                                                if( !flag )\r
@@ -3126,18 +3126,18 @@ namespace DTXMania
                                                                //-----------------------------\r
                                                                if (event2.nVelocity <= CDTXMania.ConfigIni.n切り捨て下限Velocity)        // #23857 2010.12.12 yyagi: to support VelocityMin\r
                                                                        continue;       // 電子ドラムによる意図的なクロストークを無効にする\r
-                                                               CDTX.CChip chip15 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x15);     // LT\r
-                                                               CDTX.CChip chip16 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x17);     // FT\r
-                                                               E判定 e判定13 = (chip15 != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chip15, this.nInputAdjustTimeMs_Drums) : E判定.Miss;\r
-                                                               E判定 e判定14 = (chip16 != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chip16, this.nInputAdjustTimeMs_Drums) : E判定.Miss;\r
+                                                               CDTX.CChip chipLT = this.r指定時刻に一番近い未ヒットChip(nTime, 0x15);     // LT\r
+                                                               CDTX.CChip chipFT = this.r指定時刻に一番近い未ヒットChip(nTime, 0x17);     // FT\r
+                                                               E判定 e判定LT = (chipLT != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chipLT, this.nInputAdjustTimeMs.Drums) : E判定.Miss;\r
+                                                               E判定 e判定FT = (chipFT != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chipFT, this.nInputAdjustTimeMs.Drums) : E判定.Miss;\r
                                                                switch( eFTGroup )\r
                                                                {\r
                                                                        case EFTGroup.打ち分ける:\r
                                                                                #region [ *** ]\r
                                                                                //-----------------------------\r
-                                                                               if( e判定13 != E判定.Miss )\r
+                                                                               if( e判定LT != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.LT, chip15, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.LT, chipLT, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
                                                                                break;\r
@@ -3147,31 +3147,31 @@ namespace DTXMania
                                                                        case EFTGroup.共通:\r
                                                                                #region [ *** ]\r
                                                                                //-----------------------------\r
-                                                                               if( ( e判定13 != E判定.Miss ) && ( e判定14 != E判定.Miss ) )\r
+                                                                               if( ( e判定LT != E判定.Miss ) && ( e判定FT != E判定.Miss ) )\r
                                                                                {\r
-                                                                                       if( chip15.n発声位置 < chip16.n発声位置 )\r
+                                                                                       if( chipLT.n発声位置 < chipFT.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.LT, chip15, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.LT, chipLT, event2.nVelocity );\r
                                                                                        }\r
-                                                                                       else if( chip15.n発声位置 > chip16.n発声位置 )\r
+                                                                                       else if( chipLT.n発声位置 > chipFT.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.LT, chip16, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.LT, chipFT, event2.nVelocity );\r
                                                                                        }\r
                                                                                        else\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.LT, chip15, event2.nVelocity );\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.LT, chip16, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.LT, chipLT, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.LT, chipFT, event2.nVelocity );\r
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定13 != E判定.Miss )\r
+                                                                               else if( e判定LT != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.LT, chip15, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.LT, chipLT, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定14 != E判定.Miss )\r
+                                                                               else if( e判定FT != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.LT, chip16, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.LT, chipFT, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
                                                                                break;\r
@@ -3189,18 +3189,18 @@ namespace DTXMania
                                                                //-----------------------------\r
                                                                if (event2.nVelocity <= CDTXMania.ConfigIni.n切り捨て下限Velocity)        // #23857 2010.12.12 yyagi: to support VelocityMin\r
                                                                        continue;       // 電子ドラムによる意図的なクロストークを無効にする\r
-                                                               CDTX.CChip chip17 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x15);\r
-                                                               CDTX.CChip chip18 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x17);\r
-                                                               E判定 e判定15 = (chip17 != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chip17, this.nInputAdjustTimeMs_Drums) : E判定.Miss;\r
-                                                               E判定 e判定16 = (chip18 != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chip18, this.nInputAdjustTimeMs_Drums) : E判定.Miss;\r
+                                                               CDTX.CChip chipLT_ = this.r指定時刻に一番近い未ヒットChip(nTime, 0x15);    // LT\r
+                                                               CDTX.CChip chipFT_ = this.r指定時刻に一番近い未ヒットChip(nTime, 0x17);    // FT\r
+                                                               E判定 e判定LT_ = (chipLT_ != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chipLT_, this.nInputAdjustTimeMs.Drums) : E判定.Miss;\r
+                                                               E判定 e判定FT_ = (chipFT_ != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chipFT_, this.nInputAdjustTimeMs.Drums) : E判定.Miss;\r
                                                                switch( eFTGroup )\r
                                                                {\r
                                                                        case EFTGroup.打ち分ける:\r
                                                                                #region [ *** ]\r
                                                                                //-----------------------------\r
-                                                                               if( e判定16 != E判定.Miss )\r
+                                                                               if( e判定FT_ != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.FT, chip18, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.FT, chipFT_, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
                                                                                //-----------------------------\r
@@ -3210,31 +3210,31 @@ namespace DTXMania
                                                                        case EFTGroup.共通:\r
                                                                                #region [ *** ]\r
                                                                                //-----------------------------\r
-                                                                               if( ( e判定15 != E判定.Miss ) && ( e判定16 != E判定.Miss ) )\r
+                                                                               if( ( e判定LT_ != E判定.Miss ) && ( e判定FT_ != E判定.Miss ) )\r
                                                                                {\r
-                                                                                       if( chip17.n発声位置 < chip18.n発声位置 )\r
+                                                                                       if( chipLT_.n発声位置 < chipFT_.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.FT, chip17, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.FT, chipLT_, event2.nVelocity );\r
                                                                                        }\r
-                                                                                       else if( chip17.n発声位置 > chip18.n発声位置 )\r
+                                                                                       else if( chipLT_.n発声位置 > chipFT_.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.FT, chip18, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.FT, chipFT_, event2.nVelocity );\r
                                                                                        }\r
                                                                                        else\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.FT, chip17, event2.nVelocity );\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.FT, chip18, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.FT, chipLT_, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.FT, chipFT_, event2.nVelocity );\r
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定15 != E判定.Miss )\r
+                                                                               else if( e判定LT_ != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.FT, chip17, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.FT, chipLT_, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定16 != E判定.Miss )\r
+                                                                               else if( e判定FT_ != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.FT, chip18, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.FT, chipFT_, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
                                                                                //-----------------------------\r
@@ -3253,14 +3253,14 @@ namespace DTXMania
                                                                {\r
                                                                        if (event2.nVelocity <= CDTXMania.ConfigIni.n切り捨て下限Velocity)        // #23857 2010.12.12 yyagi: to support VelocityMin\r
                                                                                continue;       // 電子ドラムによる意図的なクロストークを無効にする\r
-                                                                       CDTX.CChip chip19 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x16);\r
-                                                                       CDTX.CChip chip20 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x19);\r
+                                                                       CDTX.CChip chipCY = this.r指定時刻に一番近い未ヒットChip(nTime, 0x16);     // CY\r
+                                                                       CDTX.CChip chipRD = this.r指定時刻に一番近い未ヒットChip(nTime, 0x19);     // RD\r
                                                                        CDTX.CChip chip21 = CDTXMania.ConfigIni.bシンバルフリー ? this.r指定時刻に一番近い未ヒットChip(nTime, 0x1a) : null;\r
-                                                                       E判定 e判定17 = ( chip19 != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chip19, this.nInputAdjustTimeMs_Drums ) : E判定.Miss;\r
-                                                                       E判定 e判定18 = ( chip20 != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chip20, this.nInputAdjustTimeMs_Drums ) : E判定.Miss;\r
-                                                                       E判定 e判定19 = ( chip21 != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chip21, this.nInputAdjustTimeMs_Drums ) : E判定.Miss;\r
-                                                                       CDTX.CChip[] chipArray4 = new CDTX.CChip[] { chip19, chip20, chip21 };\r
-                                                                       E判定[] e判定Array2 = new E判定[] { e判定17, e判定18, e判定19 };\r
+                                                                       E判定 e判定CY = ( chipCY != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chipCY, this.nInputAdjustTimeMs.Drums ) : E判定.Miss;\r
+                                                                       E判定 e判定RD = ( chipRD != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chipRD, this.nInputAdjustTimeMs.Drums ) : E判定.Miss;\r
+                                                                       E判定 e判定19 = ( chip21 != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chip21, this.nInputAdjustTimeMs.Drums ) : E判定.Miss;\r
+                                                                       CDTX.CChip[] chipArray4 = new CDTX.CChip[] { chipCY, chipRD, chip21 };\r
+                                                                       E判定[] e判定Array2 = new E判定[] { e判定CY, e判定RD, e判定19 };\r
                                                                        num8 = 0;\r
                                                                        while( num8 < 2 )\r
                                                                        {\r
@@ -3285,9 +3285,9 @@ namespace DTXMania
                                                                                case ECYGroup.打ち分ける:\r
                                                                                        if( !CDTXMania.ConfigIni.bシンバルフリー )\r
                                                                                        {\r
-                                                                                               if( e判定17 != E判定.Miss )\r
+                                                                                               if( e判定CY != E判定.Miss )\r
                                                                                                {\r
-                                                                                                       this.tドラムヒット処理( nTime, Eパッド.CY, chip19, event2.nVelocity );\r
+                                                                                                       this.tドラムヒット処理( nTime, Eパッド.CY, chipCY, event2.nVelocity );\r
                                                                                                        flag = true;\r
                                                                                                }\r
                                                                                                if( !flag )\r
@@ -3297,7 +3297,7 @@ namespace DTXMania
                                                                                        num10 = 0;\r
                                                                                        while( num10 < 3 )\r
                                                                                        {\r
-                                                                                               if( ( e判定Array2[ num10 ] != E判定.Miss ) && ( ( chipArray4[ num10 ] == chip19 ) || ( chipArray4[ num10 ] == chip21 ) ) )\r
+                                                                                               if( ( e判定Array2[ num10 ] != E判定.Miss ) && ( ( chipArray4[ num10 ] == chipCY ) || ( chipArray4[ num10 ] == chip21 ) ) )\r
                                                                                                {\r
                                                                                                        this.tドラムヒット処理( nTime, Eパッド.CY, chipArray4[ num10 ], event2.nVelocity );\r
                                                                                                        flag = true;\r
@@ -3305,9 +3305,9 @@ namespace DTXMania
                                                                                                }\r
                                                                                                num10++;\r
                                                                                        }\r
-                                                                                       if( e判定17 != E判定.Miss )\r
+                                                                                       if( e判定CY != E判定.Miss )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.CY, chip19, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.CY, chipCY, event2.nVelocity );\r
                                                                                                flag = true;\r
                                                                                        }\r
                                                                                        if( !flag )\r
@@ -3320,7 +3320,7 @@ namespace DTXMania
                                                                                                num12 = 0;\r
                                                                                                while( num12 < 3 )\r
                                                                                                {\r
-                                                                                                       if( ( e判定Array2[ num12 ] != E判定.Miss ) && ( ( chipArray4[ num12 ] == chip19 ) || ( chipArray4[ num12 ] == chip20 ) ) )\r
+                                                                                                       if( ( e判定Array2[ num12 ] != E判定.Miss ) && ( ( chipArray4[ num12 ] == chipCY ) || ( chipArray4[ num12 ] == chipRD ) ) )\r
                                                                                                        {\r
                                                                                                                this.tドラムヒット処理( nTime, Eパッド.CY, chipArray4[ num12 ], event2.nVelocity );\r
                                                                                                                flag = true;\r
@@ -3360,18 +3360,18 @@ namespace DTXMania
                                                                if( event2.nVelocity <= CDTXMania.ConfigIni.nハイハット切り捨て下限Velocity )\r
                                                                        continue;       // 電子ドラムによる意図的なクロストークを無効にする\r
 \r
-                                                               CDTX.CChip chip5 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x11);\r
-                                                               CDTX.CChip chip6 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x18);\r
-                                                               CDTX.CChip chip7 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x1a);\r
-                                                               E判定 e判定4 = (chip5 != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chip5, this.nInputAdjustTimeMs_Drums) : E判定.Miss;\r
-                                                               E判定 e判定5 = (chip6 != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chip6, this.nInputAdjustTimeMs_Drums) : E判定.Miss;\r
-                                                               E判定 e判定6 = (chip7 != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chip7, this.nInputAdjustTimeMs_Drums) : E判定.Miss;\r
+                                                               CDTX.CChip chipHC_ = this.r指定時刻に一番近い未ヒットChip(nTime, 0x11);    // HC\r
+                                                               CDTX.CChip chipHO_ = this.r指定時刻に一番近い未ヒットChip(nTime, 0x18);    // HO\r
+                                                               CDTX.CChip chipLC_ = this.r指定時刻に一番近い未ヒットChip(nTime, 0x1a);    // LC\r
+                                                               E判定 e判定HC_ = (chipHC_ != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chipHC_, this.nInputAdjustTimeMs.Drums) : E判定.Miss;\r
+                                                               E判定 e判定HO_ = (chipHO_ != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chipHO_, this.nInputAdjustTimeMs.Drums) : E判定.Miss;\r
+                                                               E判定 e判定LC_ = (chipLC_ != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chipLC_, this.nInputAdjustTimeMs.Drums) : E判定.Miss;\r
                                                                switch( eHHGroup )\r
                                                                {\r
                                                                        case EHHGroup.全部打ち分ける:\r
-                                                                               if( e判定5 != E判定.Miss )\r
+                                                                               if( e判定HO_ != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chip6, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chipHO_, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
                                                                                if( !flag )\r
@@ -3379,31 +3379,31 @@ namespace DTXMania
                                                                                continue;\r
 \r
                                                                        case EHHGroup.ハイハットのみ打ち分ける:\r
-                                                                               if( ( e判定5 != E判定.Miss ) && ( e判定6 != E判定.Miss ) )\r
+                                                                               if( ( e判定HO_ != E判定.Miss ) && ( e判定LC_ != E判定.Miss ) )\r
                                                                                {\r
-                                                                                       if( chip6.n発声位置 < chip7.n発声位置 )\r
+                                                                                       if( chipHO_.n発声位置 < chipLC_.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip6, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHO_, event2.nVelocity );\r
                                                                                        }\r
-                                                                                       else if( chip6.n発声位置 > chip7.n発声位置 )\r
+                                                                                       else if( chipHO_.n発声位置 > chipLC_.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip7, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipLC_, event2.nVelocity );\r
                                                                                        }\r
                                                                                        else\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip6, event2.nVelocity );\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip7, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHO_, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipLC_, event2.nVelocity );\r
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定5 != E判定.Miss )\r
+                                                                               else if( e判定HO_ != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chip6, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chipHO_, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定6 != E判定.Miss )\r
+                                                                               else if( e判定LC_ != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chip7, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chipLC_, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
                                                                                if( !flag )\r
@@ -3411,31 +3411,31 @@ namespace DTXMania
                                                                                continue;\r
 \r
                                                                        case EHHGroup.左シンバルのみ打ち分ける:\r
-                                                                               if( ( e判定4 != E判定.Miss ) && ( e判定5 != E判定.Miss ) )\r
+                                                                               if( ( e判定HC_ != E判定.Miss ) && ( e判定HO_ != E判定.Miss ) )\r
                                                                                {\r
-                                                                                       if( chip5.n発声位置 < chip6.n発声位置 )\r
+                                                                                       if( chipHC_.n発声位置 < chipHO_.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip5, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHC_, event2.nVelocity );\r
                                                                                        }\r
-                                                                                       else if( chip5.n発声位置 > chip6.n発声位置 )\r
+                                                                                       else if( chipHC_.n発声位置 > chipHO_.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip6, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHO_, event2.nVelocity );\r
                                                                                        }\r
                                                                                        else\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip5, event2.nVelocity );\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip6, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHC_, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHO_, event2.nVelocity );\r
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定4 != E判定.Miss )\r
+                                                                               else if( e判定HC_ != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chip5, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chipHC_, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定5 != E判定.Miss )\r
+                                                                               else if( e判定HO_ != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chip6, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chipHO_, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
                                                                                if( !flag )\r
@@ -3443,10 +3443,10 @@ namespace DTXMania
                                                                                continue;\r
 \r
                                                                        case EHHGroup.全部共通:\r
-                                                                               if( ( ( e判定4 != E判定.Miss ) && ( e判定5 != E判定.Miss ) ) && ( e判定6 != E判定.Miss ) )\r
+                                                                               if( ( ( e判定HC_ != E判定.Miss ) && ( e判定HO_ != E判定.Miss ) ) && ( e判定LC_ != E判定.Miss ) )\r
                                                                                {\r
                                                                                        CDTX.CChip chip8;\r
-                                                                                       CDTX.CChip[] chipArray2 = new CDTX.CChip[] { chip5, chip6, chip7 };\r
+                                                                                       CDTX.CChip[] chipArray2 = new CDTX.CChip[] { chipHC_, chipHO_, chipLC_ };\r
                                                                                        if( chipArray2[ 1 ].n発声位置 > chipArray2[ 2 ].n発声位置 )\r
                                                                                        {\r
                                                                                                chip8 = chipArray2[ 1 ];\r
@@ -3476,70 +3476,70 @@ namespace DTXMania
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( ( e判定4 != E判定.Miss ) && ( e判定5 != E判定.Miss ) )\r
+                                                                               else if( ( e判定HC_ != E判定.Miss ) && ( e判定HO_ != E判定.Miss ) )\r
                                                                                {\r
-                                                                                       if( chip5.n発声位置 < chip6.n発声位置 )\r
+                                                                                       if( chipHC_.n発声位置 < chipHO_.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip5, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHC_, event2.nVelocity );\r
                                                                                        }\r
-                                                                                       else if( chip5.n発声位置 > chip6.n発声位置 )\r
+                                                                                       else if( chipHC_.n発声位置 > chipHO_.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip6, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHO_, event2.nVelocity );\r
                                                                                        }\r
                                                                                        else\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip5, event2.nVelocity );\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip6, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHC_, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHO_, event2.nVelocity );\r
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( ( e判定4 != E判定.Miss ) && ( e判定6 != E判定.Miss ) )\r
+                                                                               else if( ( e判定HC_ != E判定.Miss ) && ( e判定LC_ != E判定.Miss ) )\r
                                                                                {\r
-                                                                                       if( chip5.n発声位置 < chip7.n発声位置 )\r
+                                                                                       if( chipHC_.n発声位置 < chipLC_.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip5, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHC_, event2.nVelocity );\r
                                                                                        }\r
-                                                                                       else if( chip5.n発声位置 > chip7.n発声位置 )\r
+                                                                                       else if( chipHC_.n発声位置 > chipLC_.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip7, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipLC_, event2.nVelocity );\r
                                                                                        }\r
                                                                                        else\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip5, event2.nVelocity );\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip7, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHC_, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipLC_, event2.nVelocity );\r
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( ( e判定5 != E判定.Miss ) && ( e判定6 != E判定.Miss ) )\r
+                                                                               else if( ( e判定HO_ != E判定.Miss ) && ( e判定LC_ != E判定.Miss ) )\r
                                                                                {\r
-                                                                                       if( chip6.n発声位置 < chip7.n発声位置 )\r
+                                                                                       if( chipHO_.n発声位置 < chipLC_.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip6, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHO_, event2.nVelocity );\r
                                                                                        }\r
-                                                                                       else if( chip6.n発声位置 > chip7.n発声位置 )\r
+                                                                                       else if( chipHO_.n発声位置 > chipLC_.n発声位置 )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip7, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipLC_, event2.nVelocity );\r
                                                                                        }\r
                                                                                        else\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip6, event2.nVelocity );\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chip7, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipHO_, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.HHO, chipLC_, event2.nVelocity );\r
                                                                                        }\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定4 != E判定.Miss )\r
+                                                                               else if( e判定HC_ != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chip5, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chipHC_, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定5 != E判定.Miss )\r
+                                                                               else if( e判定HO_ != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chip6, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chipHO_, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
-                                                                               else if( e判定6 != E判定.Miss )\r
+                                                                               else if( e判定LC_ != E判定.Miss )\r
                                                                                {\r
-                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chip7, event2.nVelocity );\r
+                                                                                       this.tドラムヒット処理( nTime, Eパッド.HHO, chipLC_, event2.nVelocity );\r
                                                                                        flag = true;\r
                                                                                }\r
                                                                                if( !flag )\r
@@ -3558,14 +3558,14 @@ namespace DTXMania
                                                                {\r
                                                                        if (event2.nVelocity <= CDTXMania.ConfigIni.n切り捨て下限Velocity)        // #23857 2010.12.12 yyagi: to support VelocityMin\r
                                                                                continue;       // 電子ドラムによる意図的なクロストークを無効にする\r
-                                                                       CDTX.CChip chip23 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x16);\r
-                                                                       CDTX.CChip chip24 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x19);\r
+                                                                       CDTX.CChip chipCY_ = this.r指定時刻に一番近い未ヒットChip(nTime, 0x16);    // CY\r
+                                                                       CDTX.CChip chipRD_ = this.r指定時刻に一番近い未ヒットChip(nTime, 0x19);    // RD\r
                                                                        CDTX.CChip pChip = CDTXMania.ConfigIni.bシンバルフリー ? this.r指定時刻に一番近い未ヒットChip( nTime, 0x1a ) : null;\r
-                                                                       E判定 e判定21 = ( chip23 != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chip23, this.nInputAdjustTimeMs_Drums ) : E判定.Miss;\r
-                                                                       E判定 e判定22 = (chip24 != null) ? this.e指定時刻からChipのJUDGEを返す(nTime, chip24, this.nInputAdjustTimeMs_Drums) : E判定.Miss;\r
-                                                                       E判定 e判定23 = ( pChip != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, pChip, this.nInputAdjustTimeMs_Drums ) : E判定.Miss;\r
-                                                                       CDTX.CChip[] chipArray5 = new CDTX.CChip[] { chip23, chip24, pChip };\r
-                                                                       E判定[] e判定Array3 = new E判定[] { e判定21, e判定22, e判定23 };\r
+                                                                       E判定 e判定CY_ = ( chipCY_ != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chipCY_, this.nInputAdjustTimeMs.Drums ) : E判定.Miss;\r
+                                                                       E判定 e判定RD_ = ( chipRD_ != null) ? this.e指定時刻からChipのJUDGEを返す( nTime, chipRD_, this.nInputAdjustTimeMs.Drums ) : E判定.Miss;\r
+                                                                       E判定 e判定23 = ( pChip != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, pChip, this.nInputAdjustTimeMs.Drums ) : E判定.Miss;\r
+                                                                       CDTX.CChip[] chipArray5 = new CDTX.CChip[] { chipCY_, chipRD_, pChip };\r
+                                                                       E判定[] e判定Array3 = new E判定[] { e判定CY_, e判定RD_, e判定23 };\r
                                                                        num13 = 0;\r
                                                                        while( num13 < 2 )\r
                                                                        {\r
@@ -3588,9 +3588,9 @@ namespace DTXMania
                                                                        switch( eCYGroup )\r
                                                                        {\r
                                                                                case ECYGroup.打ち分ける:\r
-                                                                                       if( e判定22 != E判定.Miss )\r
+                                                                                       if( e判定RD_ != E判定.Miss )\r
                                                                                        {\r
-                                                                                               this.tドラムヒット処理( nTime, Eパッド.RD, chip24, event2.nVelocity );\r
+                                                                                               this.tドラムヒット処理( nTime, Eパッド.RD, chipRD_, event2.nVelocity );\r
                                                                                                flag = true;\r
                                                                                        }\r
                                                                                        break;\r
@@ -3601,7 +3601,7 @@ namespace DTXMania
                                                                                                num16 = 0;\r
                                                                                                while( num16 < 3 )\r
                                                                                                {\r
-                                                                                                       if( ( e判定Array3[ num16 ] != E判定.Miss ) && ( ( chipArray5[ num16 ] == chip23 ) || ( chipArray5[ num16 ] == chip24 ) ) )\r
+                                                                                                       if( ( e判定Array3[ num16 ] != E判定.Miss ) && ( ( chipArray5[ num16 ] == chipCY_ ) || ( chipArray5[ num16 ] == chipRD_ ) ) )\r
                                                                                                        {\r
                                                                                                                this.tドラムヒット処理( nTime, Eパッド.CY, chipArray5[ num16 ], event2.nVelocity );\r
                                                                                                                flag = true;\r
@@ -3639,16 +3639,16 @@ namespace DTXMania
                                                                {\r
                                                                        if (event2.nVelocity <= CDTXMania.ConfigIni.n切り捨て下限Velocity)        // #23857 2010.12.12 yyagi: to support VelocityMin\r
                                                                                continue;       // 電子ドラムによる意図的なクロストークを無効にする\r
-                                                                       CDTX.CChip chip9 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x11);\r
-                                                                       CDTX.CChip chip10 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x18);\r
-                                                                       CDTX.CChip chip11 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x1a);\r
+                                                                       CDTX.CChip chip9 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x11);      // HC\r
+                                                                       CDTX.CChip chip10 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x18);     // HO\r
+                                                                       CDTX.CChip chip11 = this.r指定時刻に一番近い未ヒットChip(nTime, 0x1a);     // LC\r
                                                                        CDTX.CChip chip12 = CDTXMania.ConfigIni.bシンバルフリー ? this.r指定時刻に一番近い未ヒットChip(nTime, 0x16) : null;\r
                                                                        CDTX.CChip chip13 = CDTXMania.ConfigIni.bシンバルフリー ? this.r指定時刻に一番近い未ヒットChip(nTime, 0x19) : null;\r
-                                                                       E判定 e判定7 = ( chip9 != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chip9, this.nInputAdjustTimeMs_Drums ) : E判定.Miss;\r
-                                                                       E判定 e判定8 = ( chip10 != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chip10, this.nInputAdjustTimeMs_Drums ) : E判定.Miss;\r
-                                                                       E判定 e判定9 = ( chip11 != null ) ? this.e指定時刻からChipのJUDGEを返す(nTime, chip11, this.nInputAdjustTimeMs_Drums) : E判定.Miss;\r
-                                                                       E判定 e判定10 = ( chip12 != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chip12, this.nInputAdjustTimeMs_Drums ) : E判定.Miss;\r
-                                                                       E判定 e判定11 = ( chip13 != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chip13, this.nInputAdjustTimeMs_Drums ) : E判定.Miss;\r
+                                                                       E判定 e判定7 = ( chip9 != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chip9, this.nInputAdjustTimeMs.Drums ) : E判定.Miss;\r
+                                                                       E判定 e判定8 = ( chip10 != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chip10, this.nInputAdjustTimeMs.Drums ) : E判定.Miss;\r
+                                                                       E判定 e判定9 = ( chip11 != null ) ? this.e指定時刻からChipのJUDGEを返す(nTime, chip11, this.nInputAdjustTimeMs.Drums) : E判定.Miss;\r
+                                                                       E判定 e判定10 = ( chip12 != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chip12, this.nInputAdjustTimeMs.Drums ) : E判定.Miss;\r
+                                                                       E判定 e判定11 = ( chip13 != null ) ? this.e指定時刻からChipのJUDGEを返す( nTime, chip13, this.nInputAdjustTimeMs.Drums ) : E判定.Miss;\r
                                                                        CDTX.CChip[] chipArray3 = new CDTX.CChip[] { chip9, chip10, chip11, chip12, chip13 };\r
                                                                        E判定[]  e判定Array = new E判定[] { e判定7, e判定8, e判定9, e判定10, e判定11 };\r
                                                                        num3 = 0;\r
@@ -3786,9 +3786,9 @@ namespace DTXMania
                                                        case Eパッド.HH:\r
                                                                #region [ *** ]\r
                                                                //-----------------------------\r
-                                                               chip28 = this.r指定時刻に一番近いChip・ヒット未済問わず不可視考慮( nTime, this.nパッド0Atoチャンネル0A[ 0 ] );\r
-                                                               chip29 = this.r指定時刻に一番近いChip・ヒット未済問わず不可視考慮( nTime, this.nパッド0Atoチャンネル0A[ 7 ] );\r
-                                                               chip30 = this.r指定時刻に一番近いChip・ヒット未済問わず不可視考慮( nTime, this.nパッド0Atoチャンネル0A[ 9 ] );\r
+                                                               chip28 = this.r指定時刻に一番近いChip・ヒット未済問わず不可視考慮(nTime, this.nパッド0Atoチャンネル0A[0]);\r
+                                                               chip29 = this.r指定時刻に一番近いChip・ヒット未済問わず不可視考慮(nTime, this.nパッド0Atoチャンネル0A[7]);\r
+                                                               chip30 = this.r指定時刻に一番近いChip・ヒット未済問わず不可視考慮(nTime, this.nパッド0Atoチャンネル0A[9]);\r
                                                                switch( CDTXMania.ConfigIni.eHHGroup )\r
                                                                {\r
                                                                        case EHHGroup.ハイハットのみ打ち分ける:\r
@@ -4069,7 +4069,7 @@ namespace DTXMania
                                                        this.t入力メソッド記憶( E楽器パート.BASS );\r
                                                        long nTime = event2.nTimeStamp - CDTXMania.Timer.n前回リセットした時のシステム時刻;\r
                                                        CDTX.CChip pChip = this.r指定時刻に一番近い未ヒットChip( nTime, 0xaf );\r
-                                                       E判定 e判定 = this.e指定時刻からChipのJUDGEを返す( nTime, pChip, this.nInputAdjustTimeMs_Bass );\r
+                                                       E判定 e判定 = this.e指定時刻からChipのJUDGEを返す( nTime, pChip, this.nInputAdjustTimeMs.Bass );\r
                                                        if( ( ( pChip != null ) && ( ( pChip.nチャンネル番号 & 15 ) == num4 ) ) && ( e判定 != E判定.Miss ) )\r
                                                        {\r
                                                                if( ( num != 0 ) || ( num4 == 0 ) )\r