OSDN Git Service

#24790 [DTXC] Fixed to be able to use #DTXVPLAYSPEED correctly in some EU locales.
authoryyagi <yyagi@16f42ceb-6dc6-49c8-ba94-f2d53467949d>
Wed, 1 Jun 2011 15:40:15 +0000 (15:40 +0000)
committeryyagi <yyagi@16f42ceb-6dc6-49c8-ba94-f2d53467949d>
Wed, 1 Jun 2011 15:40:15 +0000 (15:40 +0000)
#none some refactors:  To change names for local variables, and replaced from "0x50f" to "36*36-1".

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

DTXCreatorプロジェクト/コード/00.全体/CDTX入出力.cs

index 3f27c5f..191978a 100644 (file)
@@ -156,7 +156,7 @@ namespace DTXCreator
                                                cチップ.nチャンネル番号00toFF = 8;\r
                                                cチップ.f値・浮動小数 = cチップ.n値・整数1to1295;\r
                                                cチップ.b裏 = false;\r
-                                               for( int j = 1; j <= 0x50f; j++ )\r
+                                               for( int j = 1; j <= 36 * 36 - 1; j++ )\r
                                                {\r
                                                        if( !this._Form.mgr譜面管理者.dicBPx.ContainsKey( j ) )\r
                                                        {\r
@@ -171,7 +171,7 @@ namespace DTXCreator
                }\r
                private void tDTX入力・キャッシュからListViewを一括構築する()\r
                {\r
-                       for( int i = 1; i <= 0x50f; i++ )\r
+                       for( int i = 1; i <= 36 * 36 - 1; i++ )\r
                        {\r
                                CWAV cwav = this._Form.mgrWAVリスト管理者.tWAVをキャッシュから検索して返す( i );\r
                                if( cwav != null )\r
@@ -364,7 +364,7 @@ namespace DTXCreator
                                return false;\r
                        }\r
                        int num = C変換.n36進数2桁の文字列を数値に変換して返す( strコマンド.Substring( 0, 2 ) );\r
-                       if( ( num < 1 ) || ( num > 0x50f ) )\r
+                       if( ( num < 1 ) || ( num > 36 * 36 - 1 ) )\r
                        {\r
                                return false;\r
                        }\r
@@ -384,7 +384,7 @@ namespace DTXCreator
                                return false;\r
                        }\r
                        int num = C変換.n36進数2桁の文字列を数値に変換して返す( strパラメータ.Substring( 0, 2 ) );\r
-                       if( ( num < 1 ) || ( num > 0x50f ) )\r
+                       if( ( num < 1 ) || ( num > 36 * 36 - 1 ) )\r
                        {\r
                                return false;\r
                        }\r
@@ -402,7 +402,7 @@ namespace DTXCreator
                                return false;\r
                        }\r
                        int num = C変換.n36進数2桁の文字列を数値に変換して返す( strコマンド.Substring( 0, 2 ) );\r
-                       if( ( num < 1 ) || ( num > 0x50f ) )\r
+                       if( ( num < 1 ) || ( num > 36 * 36 - 1 ) )\r
                        {\r
                                return false;\r
                        }\r
@@ -423,7 +423,7 @@ namespace DTXCreator
                                return false;\r
                        }\r
                        int num = C変換.n36進数2桁の文字列を数値に変換して返す( strコマンド.Substring( 0, 2 ) );\r
-                       if( ( num < 1 ) || ( num > 0x50f ) )\r
+                       if( ( num < 1 ) || ( num > 36 * 36 - 1 ) )\r
                        {\r
                                return false;\r
                        }\r
@@ -444,7 +444,7 @@ namespace DTXCreator
                                return false;\r
                        }\r
                        int key = C変換.n36進数2桁の文字列を数値に変換して返す( strコマンド.Substring( 0, 2 ) );\r
-                       if( ( key < 1 ) || ( key > 0x50f ) )\r
+                       if( ( key < 1 ) || ( key > 36 * 36 - 1 ) )\r
                        {\r
                                return false;\r
                        }\r
@@ -458,7 +458,7 @@ namespace DTXCreator
                }\r
                private bool tDTX入力・行解析・DTXC_AVIBACKCOLOR( string strコマンド, string strパラメータ, string strコメント )\r
                {\r
-                       int num;\r
+                       int nChipNo;\r
                        if( !strコマンド.Equals( "DTXC_AVIBACKCOLOR", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
                                return false;\r
@@ -468,24 +468,24 @@ namespace DTXCreator
                        {\r
                                return false;\r
                        }\r
-                       if( !int.TryParse( strArray[ 0 ], out num ) )\r
+                       if( !int.TryParse( strArray[ 0 ], out nChipNo ) )\r
                        {\r
                                return false;\r
                        }\r
-                       if( ( num < 0 ) || ( num > 0x50e ) )\r
+                       if( ( nChipNo < 0 ) || ( nChipNo > 36 * 36 - 2 ) )\r
                        {\r
                                return false;\r
                        }\r
                        Color color = ColorTranslator.FromHtml( strArray[ 1 ] );\r
-                       if( ( num >= 0 ) && ( num <= 0x50e ) )\r
+                       if( ( nChipNo >= 0 ) && ( nChipNo <= 36 * 36 - 2 ) )\r
                        {\r
-                               this._Form.mgrAVIリスト管理者.tAVIをキャッシュから検索して返す・なければ新規生成する( num + 1 ).col背景色 = color;\r
+                               this._Form.mgrAVIリスト管理者.tAVIをキャッシュから検索して返す・なければ新規生成する( nChipNo + 1 ).col背景色 = color;\r
                        }\r
                        return true;\r
                }\r
                private bool tDTX入力・行解析・DTXC_AVIFORECOLOR( string strコマンド, string strパラメータ, string strコメント )\r
                {\r
-                       int num;\r
+                       int nChipNo;\r
                        if( !strコマンド.Equals( "DTXC_AVIFORECOLOR", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
                                return false;\r
@@ -495,24 +495,24 @@ namespace DTXCreator
                        {\r
                                return false;\r
                        }\r
-                       if( !int.TryParse( strArray[ 0 ], out num ) )\r
+                       if( !int.TryParse( strArray[ 0 ], out nChipNo ) )\r
                        {\r
                                return false;\r
                        }\r
-                       if( ( num < 0 ) || ( num > 0x50e ) )\r
+                       if( ( nChipNo < 0 ) || ( nChipNo > 36 * 36 - 2 ) )\r
                        {\r
                                return false;\r
                        }\r
                        Color color = ColorTranslator.FromHtml( strArray[ 1 ] );\r
-                       if( ( num >= 0 ) && ( num <= 0x50e ) )\r
+                       if( ( nChipNo >= 0 ) && ( nChipNo <= 36 * 36 - 2 ) )\r
                        {\r
-                               this._Form.mgrAVIリスト管理者.tAVIをキャッシュから検索して返す・なければ新規生成する( num + 1 ).col文字色 = color;\r
+                               this._Form.mgrAVIリスト管理者.tAVIをキャッシュから検索して返す・なければ新規生成する( nChipNo + 1 ).col文字色 = color;\r
                        }\r
                        return true;\r
                }\r
                private bool tDTX入力・行解析・DTXC_BMPBACKCOLOR( string strコマンド, string strパラメータ, string strコメント )\r
                {\r
-                       int num;\r
+                       int nChipNo;\r
                        if( !strコマンド.Equals( "DTXC_BMPBACKCOLOR", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
                                return false;\r
@@ -522,24 +522,24 @@ namespace DTXCreator
                        {\r
                                return false;\r
                        }\r
-                       if( !int.TryParse( strArray[ 0 ], out num ) )\r
+                       if( !int.TryParse( strArray[ 0 ], out nChipNo ) )\r
                        {\r
                                return false;\r
                        }\r
-                       if( ( num < 0 ) || ( num > 0x50e ) )\r
+                       if( ( nChipNo < 0 ) || ( nChipNo > 36 * 36 - 2 ) )\r
                        {\r
                                return false;\r
                        }\r
                        Color color = ColorTranslator.FromHtml( strArray[ 1 ] );\r
-                       if( ( num >= 0 ) && ( num <= 0x50e ) )\r
+                       if( ( nChipNo >= 0 ) && ( nChipNo <= 36 * 36 - 2 ) )\r
                        {\r
-                               this._Form.mgrBMPリスト管理者.tBMPをキャッシュから検索して返す・なければ新規生成する( num + 1 ).col背景色 = color;\r
+                               this._Form.mgrBMPリスト管理者.tBMPをキャッシュから検索して返す・なければ新規生成する( nChipNo + 1 ).col背景色 = color;\r
                        }\r
                        return true;\r
                }\r
                private bool tDTX入力・行解析・DTXC_BMPFORECOLOR( string strコマンド, string strパラメータ, string strコメント )\r
                {\r
-                       int num;\r
+                       int nChipNo;\r
                        if( !strコマンド.Equals( "DTXC_BMPFORECOLOR", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
                                return false;\r
@@ -549,18 +549,18 @@ namespace DTXCreator
                        {\r
                                return false;\r
                        }\r
-                       if( !int.TryParse( strArray[ 0 ], out num ) )\r
+                       if( !int.TryParse( strArray[ 0 ], out nChipNo ) )\r
                        {\r
                                return false;\r
                        }\r
-                       if( ( num < 0 ) || ( num > 0x50e ) )\r
+                       if( ( nChipNo < 0 ) || ( nChipNo > 36 * 36 - 2 ) )\r
                        {\r
                                return false;\r
                        }\r
                        Color color = ColorTranslator.FromHtml( strArray[ 1 ] );\r
-                       if( ( num >= 0 ) && ( num <= 0x50e ) )\r
+                       if( ( nChipNo >= 0 ) && ( nChipNo <= 36 * 36 - 2 ) )\r
                        {\r
-                               this._Form.mgrBMPリスト管理者.tBMPをキャッシュから検索して返す・なければ新規生成する( num + 1 ).col文字色 = color;\r
+                               this._Form.mgrBMPリスト管理者.tBMPをキャッシュから検索して返す・なければ新規生成する( nChipNo + 1 ).col文字色 = color;\r
                        }\r
                        return true;\r
                }\r
@@ -577,7 +577,7 @@ namespace DTXCreator
                                if( ( ( strArray2.Length == 2 ) && int.TryParse( strArray2[ 0 ], out num ) ) && ( ( num >= 0 ) && ( num <= 2 ) ) )\r
                                {\r
                                        int item = C変換.n36進数2桁の文字列を数値に変換して返す( strArray2[ 1 ] );\r
-                                       if( ( item >= 1 ) && ( item <= 0x50f ) )\r
+                                       if( ( item >= 1 ) && ( item <= 36 * 36 - 1 ) )\r
                                        {\r
                                                this.listチップパレット.Add( num );\r
                                                this.listチップパレット.Add( item );\r
@@ -590,30 +590,30 @@ namespace DTXCreator
                {\r
                        if( strコマンド.Equals( "DTXC_LANEBINDEDCHIP", StringComparison.OrdinalIgnoreCase ) && ( strパラメータ.Length == 8 ) )\r
                        {\r
-                               int num;\r
-                               if( !int.TryParse( strパラメータ.Substring( 0, 2 ), out num ) )\r
+                               int nLaneNo;\r
+                               if( !int.TryParse( strパラメータ.Substring( 0, 2 ), out nLaneNo ) )\r
                                {\r
                                        return false;\r
                                }\r
-                               int num2 = C変換.n36進数2桁の文字列を数値に変換して返す( strパラメータ.Substring( 3, 2 ) );\r
-                               if( ( num2 < 0 ) || ( num2 > 0x50f ) )\r
+                               int nChipNoFore = C変換.n36進数2桁の文字列を数値に変換して返す( strパラメータ.Substring( 3, 2 ) );\r
+                               if( ( nChipNoFore < 0 ) || ( nChipNoFore > 36 * 36 - 1 ) )\r
                                {\r
                                        return false;\r
                                }\r
-                               int num3 = C変換.n36進数2桁の文字列を数値に変換して返す( strパラメータ.Substring( 6, 2 ) );\r
-                               if( ( num3 < 0 ) || ( num3 > 0x50f ) )\r
+                               int nChipNoBack = C変換.n36進数2桁の文字列を数値に変換して返す( strパラメータ.Substring( 6, 2 ) );\r
+                               if( ( nChipNoBack < 0 ) || ( nChipNoBack > 36 * 36 - 1 ) )\r
                                {\r
                                        return false;\r
                                }\r
-                               if( ( num >= 0 ) && ( num < this._Form.mgr譜面管理者.listレーン.Count ) )\r
+                               if( ( nLaneNo >= 0 ) && ( nLaneNo < this._Form.mgr譜面管理者.listレーン.Count ) )\r
                                {\r
-                                       if( num2 != 0 )\r
+                                       if( nChipNoFore != 0 )\r
                                        {\r
-                                               this._Form.mgr譜面管理者.listレーン[ num ].nレーン割付チップ・表0or1to1295 = num2;\r
+                                               this._Form.mgr譜面管理者.listレーン[ nLaneNo ].nレーン割付チップ・表0or1to1295 = nChipNoFore;\r
                                        }\r
-                                       if( num3 != 0 )\r
+                                       if( nChipNoBack != 0 )\r
                                        {\r
-                                               this._Form.mgr譜面管理者.listレーン[ num ].nレーン割付チップ・裏0or1to1295 = num3;\r
+                                               this._Form.mgr譜面管理者.listレーン[ nLaneNo ].nレーン割付チップ・裏0or1to1295 = nChipNoBack;\r
                                        }\r
                                        return true;\r
                                }\r
@@ -622,7 +622,7 @@ namespace DTXCreator
                }\r
                private bool tDTX入力・行解析・DTXC_WAVBACKCOLOR( string strコマンド, string strパラメータ, string strコメント )\r
                {\r
-                       int num;\r
+                       int nChipNo;\r
                        if( !strコマンド.Equals( "DTXC_WAVBACKCOLOR", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
                                return false;\r
@@ -632,24 +632,24 @@ namespace DTXCreator
                        {\r
                                return false;\r
                        }\r
-                       if( !int.TryParse( strArray[ 0 ], out num ) )\r
+                       if( !int.TryParse( strArray[ 0 ], out nChipNo ) )\r
                        {\r
                                return false;\r
                        }\r
-                       if( ( num < 0 ) || ( num > 0x50e ) )\r
+                       if( ( nChipNo < 0 ) || ( nChipNo > 36 * 36 - 2 ) )\r
                        {\r
                                return false;\r
                        }\r
                        Color color = ColorTranslator.FromHtml( strArray[ 1 ] );\r
-                       if( ( num >= 0 ) && ( num <= 0x50e ) )\r
+                       if( ( nChipNo >= 0 ) && ( nChipNo <= 36 * 36 - 2 ) )\r
                        {\r
-                               this._Form.mgrWAVリスト管理者.tWAVをキャッシュから検索して返す・なければ新規生成する( num + 1 ).col背景色 = color;\r
+                               this._Form.mgrWAVリスト管理者.tWAVをキャッシュから検索して返す・なければ新規生成する( nChipNo + 1 ).col背景色 = color;\r
                        }\r
                        return true;\r
                }\r
                private bool tDTX入力・行解析・DTXC_WAVFORECOLOR( string strコマンド, string strパラメータ, string strコメント )\r
                {\r
-                       int num;\r
+                       int nChipNo;\r
                        if( !strコマンド.Equals( "DTXC_WAVFORECOLOR", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
                                return false;\r
@@ -659,24 +659,23 @@ namespace DTXCreator
                        {\r
                                return false;\r
                        }\r
-                       if( !int.TryParse( strArray[ 0 ], out num ) )\r
+                       if( !int.TryParse( strArray[ 0 ], out nChipNo ) )\r
                        {\r
                                return false;\r
                        }\r
-                       if( ( num < 0 ) || ( num > 0x50e ) )\r
+                       if( ( nChipNo < 0 ) || ( nChipNo > 36 * 36 - 2 ) )\r
                        {\r
                                return false;\r
                        }\r
                        Color color = ColorTranslator.FromHtml( strArray[ 1 ] );\r
-                       if( ( num >= 0 ) && ( num <= 0x50e ) )\r
+                       if( ( nChipNo >= 0 ) && ( nChipNo <= 36 * 36 - 2 ) )\r
                        {\r
-                               this._Form.mgrWAVリスト管理者.tWAVをキャッシュから検索して返す・なければ新規生成する( num + 1 ).col文字色 = color;\r
+                               this._Form.mgrWAVリスト管理者.tWAVをキャッシュから検索して返す・なければ新規生成する( nChipNo + 1 ).col文字色 = color;\r
                        }\r
                        return true;\r
                }\r
                private bool tDTX入力・行解析・TITLE_ARTIST_COMMENT_その他( string strコマンド, string strパラメータ, string strコメント )\r
                {\r
-                       float num5;\r
                        if( strコマンド.Equals( "TITLE", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
                                CUndoRedo管理.bUndoRedoした直後 = true;\r
@@ -733,107 +732,110 @@ namespace DTXCreator
                        }\r
                        if( strコマンド.Equals( "BPM", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
-                               decimal num;\r
-                               if( !this.TryParse( strパラメータ, out num ) )             // #23880 2011.1.6 yyagi\r
+                               decimal dBpm;\r
+                               if( !this.TryParse( strパラメータ, out dBpm ) )            // #23880 2011.1.6 yyagi\r
                                {\r
-                                       num = 120.0M;\r
+                                       dBpm = 120.0M;\r
                                }\r
                                CUndoRedo管理.bUndoRedoした直後 = true;\r
-                               this._Form.numericUpDownBPM.Value = num;\r
+                               this._Form.numericUpDownBPM.Value = dBpm;\r
                                return true;\r
                        }\r
                        if( strコマンド.Equals( "DLEVEL", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
-                               int num2;\r
-                               if( !int.TryParse( strパラメータ, out num2 ) )\r
+                               int nLevel;\r
+                               if( !int.TryParse( strパラメータ, out nLevel ) )\r
                                {\r
-                                       num2 = 0;\r
+                                       nLevel = 0;\r
                                }\r
-                               else if( num2 < 0 )\r
+                               else if( nLevel < 0 )\r
                                {\r
-                                       num2 = 0;\r
+                                       nLevel = 0;\r
                                }\r
-                               else if( num2 > 100 )\r
+                               else if( nLevel > 100 )\r
                                {\r
-                                       num2 = 100;\r
+                                       nLevel = 100;\r
                                }\r
                                CUndoRedo管理.bUndoRedoした直後 = true;\r
-                               this._Form.hScrollBarDLEVEL.Value = num2;\r
+                               this._Form.hScrollBarDLEVEL.Value = nLevel;\r
                                CUndoRedo管理.bUndoRedoした直後 = true;\r
-                               this._Form.textBoxDLEVEL.Text = num2.ToString();\r
+                               this._Form.textBoxDLEVEL.Text = nLevel.ToString();\r
                                return true;\r
                        }\r
                        if( strコマンド.Equals( "GLEVEL", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
-                               int num3;\r
-                               if( !int.TryParse( strパラメータ, out num3 ) )\r
+                               int nLevel;\r
+                               if( !int.TryParse( strパラメータ, out nLevel ) )\r
                                {\r
-                                       num3 = 0;\r
+                                       nLevel = 0;\r
                                }\r
-                               else if( num3 < 0 )\r
+                               else if( nLevel < 0 )\r
                                {\r
-                                       num3 = 0;\r
+                                       nLevel = 0;\r
                                }\r
-                               else if( num3 > 100 )\r
+                               else if( nLevel > 100 )\r
                                {\r
-                                       num3 = 100;\r
+                                       nLevel = 100;\r
                                }\r
                                CUndoRedo管理.bUndoRedoした直後 = true;\r
-                               this._Form.hScrollBarGLEVEL.Value = num3;\r
+                               this._Form.hScrollBarGLEVEL.Value = nLevel;\r
                                CUndoRedo管理.bUndoRedoした直後 = true;\r
-                               this._Form.textBoxGLEVEL.Text = num3.ToString();\r
+                               this._Form.textBoxGLEVEL.Text = nLevel.ToString();\r
                                return true;\r
                        }\r
                        if( strコマンド.Equals( "BLEVEL", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
-                               int num4;\r
-                               if( !int.TryParse( strパラメータ, out num4 ) )\r
+                               int nLevel;\r
+                               if( !int.TryParse( strパラメータ, out nLevel ) )\r
                                {\r
-                                       num4 = 0;\r
+                                       nLevel = 0;\r
                                }\r
-                               else if( num4 < 0 )\r
+                               else if( nLevel < 0 )\r
                                {\r
-                                       num4 = 0;\r
+                                       nLevel = 0;\r
                                }\r
-                               else if( num4 > 100 )\r
+                               else if( nLevel > 100 )\r
                                {\r
-                                       num4 = 100;\r
+                                       nLevel = 100;\r
                                }\r
                                CUndoRedo管理.bUndoRedoした直後 = true;\r
-                               this._Form.hScrollBarBLEVEL.Value = num4;\r
+                               this._Form.hScrollBarBLEVEL.Value = nLevel;\r
                                CUndoRedo管理.bUndoRedoした直後 = true;\r
-                               this._Form.textBoxBLEVEL.Text = num4.ToString();\r
+                               this._Form.textBoxBLEVEL.Text = nLevel.ToString();\r
                                return true;\r
                        }\r
-                       if( !strコマンド.Equals( "DTXVPLAYSPEED", StringComparison.OrdinalIgnoreCase ) )\r
+                       if( strコマンド.Equals( "DTXVPLAYSPEED", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
+                               decimal dPlaySpeed;\r
+//                             if ( !this.TryParse( strパラメータ, out num5 ) )           // #24790 2011.4.8 yyagi\r
+                               if ( !decimal.TryParse( strパラメータ, out dPlaySpeed ) )          // #24790 2011.4.8 yyagi\r
+                               {\r
+                                       dPlaySpeed = 0M;\r
+                               }\r
+                               else if( dPlaySpeed < 0.5M )\r
+                               {\r
+                                       dPlaySpeed = 0.5M;\r
+                               }\r
+                               else if( dPlaySpeed > 1.5M )\r
+                               {\r
+                                       dPlaySpeed = 1.5M;\r
+                               }\r
+                               decimal dIndex = ( 1.5M - dPlaySpeed ) * 10M;\r
+                               int nIndex = (int) dIndex;\r
+                               if( nIndex < 0 )\r
+                               {\r
+                                       nIndex = 0;\r
+                               }\r
+                               else if( nIndex > 10 )\r
+                               {\r
+                                       nIndex = 10;\r
+                               }\r
+                               CUndoRedo管理.bUndoRedoした直後 = true;\r
+                               this._Form.toolStripComboBox演奏速度.SelectedIndex = nIndex;\r
+                               return true;\r
+                       } else {\r
                                return false;\r
                        }\r
-                       if( !float.TryParse( strパラメータ, out num5 ) )\r
-                       {\r
-                               num5 = 0f;\r
-                       }\r
-                       else if( num5 < 0.5f )\r
-                       {\r
-                               num5 = 0.5f;\r
-                       }\r
-                       else if( num5 > 1.5f )\r
-                       {\r
-                               num5 = 1.5f;\r
-                       }\r
-                       float num6 = ( 1.5f - num5 ) * 10f;\r
-                       int num7 = (int) num6;\r
-                       if( num7 < 0 )\r
-                       {\r
-                               num7 = 0;\r
-                       }\r
-                       else if( num7 > 10 )\r
-                       {\r
-                               num7 = 10;\r
-                       }\r
-                       CUndoRedo管理.bUndoRedoした直後 = true;\r
-                       this._Form.toolStripComboBox演奏速度.SelectedIndex = num7;\r
-                       return true;\r
                }\r
                private bool tDTX入力・行解析・WAV( string strコマンド, string strパラメータ, string strコメント )\r
                {\r
@@ -845,19 +847,19 @@ namespace DTXCreator
                        {\r
                                return false;\r
                        }\r
-                       int num = C変換.n36進数2桁の文字列を数値に変換して返す( strコマンド.Substring( 0, 2 ) );\r
-                       if( ( num < 1 ) || ( num > 0x50f ) )\r
+                       int nChipNo = C変換.n36進数2桁の文字列を数値に変換して返す( strコマンド.Substring( 0, 2 ) );\r
+                       if( ( nChipNo < 1 ) || ( nChipNo > 36 * 36 - 1 ) )\r
                        {\r
                                return false;\r
                        }\r
-                       CWAV cwav = this._Form.mgrWAVリスト管理者.tWAVをキャッシュから検索して返す・なければ新規生成する( num );\r
+                       CWAV cwav = this._Form.mgrWAVリスト管理者.tWAVをキャッシュから検索して返す・なければ新規生成する( nChipNo );\r
                        cwav.strラベル名 = strコメント;\r
                        cwav.strファイル名 = strパラメータ;\r
                        return true;\r
                }\r
                private bool tDTX入力・行解析・WAVPAN_PAN( string strコマンド, string strパラメータ, string strコメント )\r
                {\r
-                       int num2;\r
+                       int nPan;\r
                        if( strコマンド.StartsWith( "WAVPAN", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
                                strコマンド = strコマンド.Substring( 6 );\r
@@ -874,24 +876,24 @@ namespace DTXCreator
                        {\r
                                return false;\r
                        }\r
-                       int num = C変換.n36進数2桁の文字列を数値に変換して返す( strコマンド.Substring( 0, 2 ) );\r
-                       if( int.TryParse( strパラメータ, out num2 ) )\r
+                       int nChipNo = C変換.n36進数2桁の文字列を数値に変換して返す( strコマンド.Substring( 0, 2 ) );\r
+                       if( int.TryParse( strパラメータ, out nPan ) )\r
                        {\r
-                               if( num2 < -100 )\r
+                               if( nPan < -100 )\r
                                {\r
-                                       num2 = -100;\r
+                                       nPan = -100;\r
                                }\r
-                               else if( num2 >= 100 )\r
+                               else if( nPan >= 100 )\r
                                {\r
-                                       num2 = 100;\r
+                                       nPan = 100;\r
                                }\r
-                               this._Form.mgrWAVリスト管理者.tWAVをキャッシュから検索して返す・なければ新規生成する( num ).n位置_100to100 = num2;\r
+                               this._Form.mgrWAVリスト管理者.tWAVをキャッシュから検索して返す・なければ新規生成する( nChipNo ).n位置_100to100 = nPan;\r
                        }\r
                        return true;\r
                }\r
                private bool tDTX入力・行解析・WAVVOL_VOLUME( string strコマンド, string strパラメータ, string strコメント )\r
                {\r
-                       int num2;\r
+                       int nVol;\r
                        if( strコマンド.StartsWith( "WAVVOL", StringComparison.OrdinalIgnoreCase ) )\r
                        {\r
                                strコマンド = strコマンド.Substring( 6 );\r
@@ -908,18 +910,18 @@ namespace DTXCreator
                        {\r
                                return false;\r
                        }\r
-                       int num = C変換.n36進数2桁の文字列を数値に変換して返す( strコマンド.Substring( 0, 2 ) );\r
-                       if( int.TryParse( strパラメータ, out num2 ) )\r
+                       int nChipNo = C変換.n36進数2桁の文字列を数値に変換して返す( strコマンド.Substring( 0, 2 ) );\r
+                       if( int.TryParse( strパラメータ, out nVol ) )\r
                        {\r
-                               if( num2 < 0 )\r
+                               if( nVol < 0 )\r
                                {\r
-                                       num2 = 0;\r
+                                       nVol = 0;\r
                                }\r
-                               else if( num2 >= 100 )\r
+                               else if( nVol >= 100 )\r
                                {\r
-                                       num2 = 100;\r
+                                       nVol = 100;\r
                                }\r
-                               this._Form.mgrWAVリスト管理者.tWAVをキャッシュから検索して返す・なければ新規生成する( num ).n音量0to100 = num2;\r
+                               this._Form.mgrWAVリスト管理者.tWAVをキャッシュから検索して返す・なければ新規生成する( nChipNo ).n音量0to100 = nVol;\r
                        }\r
                        return true;\r
                }\r
@@ -948,123 +950,123 @@ namespace DTXCreator
                                {\r
                                        strパラメータ = strパラメータ.Remove( startIndex, 1 );\r
                                }\r
-                               int num5 = strパラメータ.Length / 2;\r
-                               for( int i = 0; i < num5; i++ )\r
+                               int nChips = strパラメータ.Length / 2;\r
+                               for( int i = 0; i < nChips; i++ )\r
                                {\r
-                                       int num7 = C変換.n36進数2桁の文字列を数値に変換して返す( strパラメータ.Substring( i * 2, 2 ) );\r
-                                       if( num7 != 0 )\r
+                                       int nChipNo = C変換.n36進数2桁の文字列を数値に変換して返す( strパラメータ.Substring( i * 2, 2 ) );\r
+                                       if( nChipNo != 0 )\r
                                        {\r
-                                               int num8 = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "GtV" );\r
-                                               int num9 = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "GtR" );\r
-                                               int num10 = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "GtG" );\r
-                                               int num11 = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "GtB" );\r
+                                               int nLaneGtV = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "GtV" );\r
+                                               int nLaneGtR = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "GtR" );\r
+                                               int nLaneGtG = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "GtG" );\r
+                                               int nLaneGtB = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "GtB" );\r
                                                Cチップ item = new Cチップ();\r
-                                               item.nレーン番号0to = num8;\r
+                                               item.nレーン番号0to = nLaneGtV;\r
                                                item.n位置grid = i;\r
-                                               item.n値・整数1to1295 = num7;\r
-                                               item.n読み込み時の解像度 = num5;\r
+                                               item.n値・整数1to1295 = nChipNo;\r
+                                               item.n読み込み時の解像度 = nChips;\r
                                                c小節.listチップ.Add( item );\r
                                                switch( nCh )\r
                                                {\r
                                                        case 0x20:\r
                                                                item = new Cチップ();\r
-                                                               item.nレーン番号0to = num9;\r
+                                                               item.nレーン番号0to = nLaneGtR;\r
                                                                item.n位置grid = i;\r
                                                                item.n値・整数1to1295 = 2;\r
-                                                               item.n読み込み時の解像度 = num5;\r
+                                                               item.n読み込み時の解像度 = nChips;\r
                                                                c小節.listチップ.Add( item );\r
                                                                break;\r
 \r
                                                        case 0x21:\r
                                                                item = new Cチップ();\r
-                                                               item.nレーン番号0to = num11;\r
+                                                               item.nレーン番号0to = nLaneGtB;\r
                                                                item.n位置grid = i;\r
                                                                item.n値・整数1to1295 = 1;\r
-                                                               item.n読み込み時の解像度 = num5;\r
+                                                               item.n読み込み時の解像度 = nChips;\r
                                                                c小節.listチップ.Add( item );\r
                                                                break;\r
 \r
                                                        case 0x22:\r
                                                                item = new Cチップ();\r
-                                                               item.nレーン番号0to = num10;\r
+                                                               item.nレーン番号0to = nLaneGtG;\r
                                                                item.n位置grid = i;\r
                                                                item.n値・整数1to1295 = 1;\r
-                                                               item.n読み込み時の解像度 = num5;\r
+                                                               item.n読み込み時の解像度 = nChips;\r
                                                                c小節.listチップ.Add( item );\r
                                                                break;\r
 \r
                                                        case 0x23:\r
                                                                item = new Cチップ();\r
-                                                               item.nレーン番号0to = num10;\r
+                                                               item.nレーン番号0to = nLaneGtG;\r
                                                                item.n位置grid = i;\r
                                                                item.n値・整数1to1295 = 1;\r
-                                                               item.n読み込み時の解像度 = num5;\r
+                                                               item.n読み込み時の解像度 = nChips;\r
                                                                c小節.listチップ.Add( item );\r
                                                                item = new Cチップ();\r
-                                                               item.nレーン番号0to = num11;\r
+                                                               item.nレーン番号0to = nLaneGtB;\r
                                                                item.n位置grid = i;\r
                                                                item.n値・整数1to1295 = 1;\r
-                                                               item.n読み込み時の解像度 = num5;\r
+                                                               item.n読み込み時の解像度 = nChips;\r
                                                                c小節.listチップ.Add( item );\r
                                                                break;\r
 \r
                                                        case 0x24:\r
                                                                item = new Cチップ();\r
-                                                               item.nレーン番号0to = num9;\r
+                                                               item.nレーン番号0to = nLaneGtR;\r
                                                                item.n位置grid = i;\r
                                                                item.n値・整数1to1295 = 1;\r
-                                                               item.n読み込み時の解像度 = num5;\r
+                                                               item.n読み込み時の解像度 = nChips;\r
                                                                c小節.listチップ.Add( item );\r
                                                                break;\r
 \r
                                                        case 0x25:\r
                                                                item = new Cチップ();\r
-                                                               item.nレーン番号0to = num9;\r
+                                                               item.nレーン番号0to = nLaneGtR;\r
                                                                item.n位置grid = i;\r
                                                                item.n値・整数1to1295 = 1;\r
-                                                               item.n読み込み時の解像度 = num5;\r
+                                                               item.n読み込み時の解像度 = nChips;\r
                                                                c小節.listチップ.Add( item );\r
                                                                item = new Cチップ();\r
-                                                               item.nレーン番号0to = num11;\r
+                                                               item.nレーン番号0to = nLaneGtB;\r
                                                                item.n位置grid = i;\r
                                                                item.n値・整数1to1295 = 1;\r
-                                                               item.n読み込み時の解像度 = num5;\r
+                                                               item.n読み込み時の解像度 = nChips;\r
                                                                c小節.listチップ.Add( item );\r
                                                                break;\r
 \r
                                                        case 0x26:\r
                                                                item = new Cチップ();\r
-                                                               item.nレーン番号0to = num9;\r
+                                                               item.nレーン番号0to = nLaneGtR;\r
                                                                item.n位置grid = i;\r
                                                                item.n値・整数1to1295 = 1;\r
-                                                               item.n読み込み時の解像度 = num5;\r
+                                                               item.n読み込み時の解像度 = nChips;\r
                                                                c小節.listチップ.Add( item );\r
                                                                item = new Cチップ();\r
-                                                               item.nレーン番号0to = num10;\r
+                                                               item.nレーン番号0to = nLaneGtG;\r
                                                                item.n位置grid = i;\r
                                                                item.n値・整数1to1295 = 1;\r
-                                                               item.n読み込み時の解像度 = num5;\r
+                                                               item.n読み込み時の解像度 = nChips;\r
                                                                c小節.listチップ.Add( item );\r
                                                                break;\r
 \r
                                                        case 0x27:\r
                                                                item = new Cチップ();\r
-                                                               item.nレーン番号0to = num9;\r
+                                                               item.nレーン番号0to = nLaneGtR;\r
                                                                item.n位置grid = i;\r
                                                                item.n値・整数1to1295 = 1;\r
-                                                               item.n読み込み時の解像度 = num5;\r
+                                                               item.n読み込み時の解像度 = nChips;\r
                                                                c小節.listチップ.Add( item );\r
                                                                item = new Cチップ();\r
-                                                               item.nレーン番号0to = num10;\r
+                                                               item.nレーン番号0to = nLaneGtG;\r
                                                                item.n位置grid = i;\r
                                                                item.n値・整数1to1295 = 1;\r
-                                                               item.n読み込み時の解像度 = num5;\r
+                                                               item.n読み込み時の解像度 = nChips;\r
                                                                c小節.listチップ.Add( item );\r
                                                                item = new Cチップ();\r
-                                                               item.nレーン番号0to = num11;\r
+                                                               item.nレーン番号0to = nLaneGtB;\r
                                                                item.n位置grid = i;\r
                                                                item.n値・整数1to1295 = 1;\r
-                                                               item.n読み込み時の解像度 = num5;\r
+                                                               item.n読み込み時の解像度 = nChips;\r
                                                                c小節.listチップ.Add( item );\r
                                                                break;\r
                                                }\r
@@ -1080,123 +1082,123 @@ namespace DTXCreator
                                {\r
                                        strパラメータ = strパラメータ.Remove( num12, 1 );\r
                                }\r
-                               int num13 = strパラメータ.Length / 2;\r
-                               for( int j = 0; j < num13; j++ )\r
+                               int nChips = strパラメータ.Length / 2;\r
+                               for( int j = 0; j < nChips; j++ )\r
                                {\r
-                                       int num15 = C変換.n36進数2桁の文字列を数値に変換して返す( strパラメータ.Substring( j * 2, 2 ) );\r
-                                       if( num15 != 0 )\r
+                                       int nChipNo = C変換.n36進数2桁の文字列を数値に変換して返す( strパラメータ.Substring( j * 2, 2 ) );\r
+                                       if( nChipNo != 0 )\r
                                        {\r
-                                               int num16 = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "BsV" );\r
-                                               int num17 = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "BsR" );\r
-                                               int num18 = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "BsG" );\r
-                                               int num19 = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "BsB" );\r
+                                               int nLaneBsV = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "BsV" );\r
+                                               int nLaneBsR = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "BsR" );\r
+                                               int nLanrBsG = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "BsG" );\r
+                                               int nLaneBsB = this._Form.mgr譜面管理者.nレーン名に対応するレーン番号を返す( "BsB" );\r
                                                Cチップ cチップ2 = new Cチップ();\r
-                                               cチップ2.nレーン番号0to = num16;\r
+                                               cチップ2.nレーン番号0to = nLaneBsV;\r
                                                cチップ2.n位置grid = j;\r
-                                               cチップ2.n値・整数1to1295 = num15;\r
-                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                               cチップ2.n値・整数1to1295 = nChipNo;\r
+                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                c小節2.listチップ.Add( cチップ2 );\r
                                                switch( nCh )\r
                                                {\r
                                                        case 160:\r
                                                                cチップ2 = new Cチップ();\r
-                                                               cチップ2.nレーン番号0to = num17;\r
+                                                               cチップ2.nレーン番号0to = nLaneBsR;\r
                                                                cチップ2.n位置grid = j;\r
                                                                cチップ2.n値・整数1to1295 = 2;\r
-                                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                                c小節2.listチップ.Add( cチップ2 );\r
                                                                break;\r
 \r
                                                        case 0xa1:\r
                                                                cチップ2 = new Cチップ();\r
-                                                               cチップ2.nレーン番号0to = num19;\r
+                                                               cチップ2.nレーン番号0to = nLaneBsB;\r
                                                                cチップ2.n位置grid = j;\r
                                                                cチップ2.n値・整数1to1295 = 1;\r
-                                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                                c小節2.listチップ.Add( cチップ2 );\r
                                                                break;\r
 \r
                                                        case 0xa2:\r
                                                                cチップ2 = new Cチップ();\r
-                                                               cチップ2.nレーン番号0to = num18;\r
+                                                               cチップ2.nレーン番号0to = nLanrBsG;\r
                                                                cチップ2.n位置grid = j;\r
                                                                cチップ2.n値・整数1to1295 = 1;\r
-                                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                                c小節2.listチップ.Add( cチップ2 );\r
                                                                break;\r
 \r
                                                        case 0xa3:\r
                                                                cチップ2 = new Cチップ();\r
-                                                               cチップ2.nレーン番号0to = num18;\r
+                                                               cチップ2.nレーン番号0to = nLanrBsG;\r
                                                                cチップ2.n位置grid = j;\r
                                                                cチップ2.n値・整数1to1295 = 1;\r
-                                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                                c小節2.listチップ.Add( cチップ2 );\r
                                                                cチップ2 = new Cチップ();\r
-                                                               cチップ2.nレーン番号0to = num19;\r
+                                                               cチップ2.nレーン番号0to = nLaneBsB;\r
                                                                cチップ2.n位置grid = j;\r
                                                                cチップ2.n値・整数1to1295 = 1;\r
-                                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                                c小節2.listチップ.Add( cチップ2 );\r
                                                                break;\r
 \r
                                                        case 0xa4:\r
                                                                cチップ2 = new Cチップ();\r
-                                                               cチップ2.nレーン番号0to = num17;\r
+                                                               cチップ2.nレーン番号0to = nLaneBsR;\r
                                                                cチップ2.n位置grid = j;\r
                                                                cチップ2.n値・整数1to1295 = 1;\r
-                                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                                c小節2.listチップ.Add( cチップ2 );\r
                                                                break;\r
 \r
                                                        case 0xa5:\r
                                                                cチップ2 = new Cチップ();\r
-                                                               cチップ2.nレーン番号0to = num17;\r
+                                                               cチップ2.nレーン番号0to = nLaneBsR;\r
                                                                cチップ2.n位置grid = j;\r
                                                                cチップ2.n値・整数1to1295 = 1;\r
-                                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                                c小節2.listチップ.Add( cチップ2 );\r
                                                                cチップ2 = new Cチップ();\r
-                                                               cチップ2.nレーン番号0to = num19;\r
+                                                               cチップ2.nレーン番号0to = nLaneBsB;\r
                                                                cチップ2.n位置grid = j;\r
                                                                cチップ2.n値・整数1to1295 = 1;\r
-                                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                                c小節2.listチップ.Add( cチップ2 );\r
                                                                break;\r
 \r
                                                        case 0xa6:\r
                                                                cチップ2 = new Cチップ();\r
-                                                               cチップ2.nレーン番号0to = num17;\r
+                                                               cチップ2.nレーン番号0to = nLaneBsR;\r
                                                                cチップ2.n位置grid = j;\r
                                                                cチップ2.n値・整数1to1295 = 1;\r
-                                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                                c小節2.listチップ.Add( cチップ2 );\r
                                                                cチップ2 = new Cチップ();\r
-                                                               cチップ2.nレーン番号0to = num18;\r
+                                                               cチップ2.nレーン番号0to = nLanrBsG;\r
                                                                cチップ2.n位置grid = j;\r
                                                                cチップ2.n値・整数1to1295 = 1;\r
-                                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                                c小節2.listチップ.Add( cチップ2 );\r
                                                                break;\r
 \r
                                                        case 0xa7:\r
                                                                cチップ2 = new Cチップ();\r
-                                                               cチップ2.nレーン番号0to = num17;\r
+                                                               cチップ2.nレーン番号0to = nLaneBsR;\r
                                                                cチップ2.n位置grid = j;\r
                                                                cチップ2.n値・整数1to1295 = 1;\r
-                                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                                c小節2.listチップ.Add( cチップ2 );\r
                                                                cチップ2 = new Cチップ();\r
-                                                               cチップ2.nレーン番号0to = num18;\r
+                                                               cチップ2.nレーン番号0to = nLanrBsG;\r
                                                                cチップ2.n位置grid = j;\r
                                                                cチップ2.n値・整数1to1295 = 1;\r
-                                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                                c小節2.listチップ.Add( cチップ2 );\r
                                                                cチップ2 = new Cチップ();\r
-                                                               cチップ2.nレーン番号0to = num19;\r
+                                                               cチップ2.nレーン番号0to = nLaneBsB;\r
                                                                cチップ2.n位置grid = j;\r
                                                                cチップ2.n値・整数1to1295 = 1;\r
-                                                               cチップ2.n読み込み時の解像度 = num13;\r
+                                                               cチップ2.n読み込み時の解像度 = nChips;\r
                                                                c小節2.listチップ.Add( cチップ2 );\r
                                                                break;\r
                                                }\r
@@ -1209,23 +1211,23 @@ namespace DTXCreator
                        if( this.tDTX入力・行解析・チャンネル・チャンネルに該当するレーン番号を返す( nCh, out num20, out flag ) )\r
                        {\r
                                C小節 c小節3 = this.tDTX入力・行解析・チャンネル・小節番号に対応する小節を探すか新規に作って返す( nBar );\r
-                               int num21 = 0;\r
-                               while( ( num21 = strパラメータ.IndexOf( '_' ) ) != -1 )\r
+                               int nPosOf_ = 0;\r
+                               while( ( nPosOf_ = strパラメータ.IndexOf( '_' ) ) != -1 )\r
                                {\r
-                                       strパラメータ = strパラメータ.Remove( num21, 1 );\r
+                                       strパラメータ = strパラメータ.Remove( nPosOf_, 1 );\r
                                }\r
-                               int num22 = strパラメータ.Length / 2;\r
-                               for( int k = 0; k < num22; k++ )\r
+                               int nChips = strパラメータ.Length / 2;\r
+                               for( int i = 0; i < nChips; i++ )\r
                                {\r
-                                       int num24 = ( nCh == 3 ) ? C変換.n16進数2桁の文字列を数値に変換して返す( strパラメータ.Substring( k * 2, 2 ) ) : C変換.n36進数2桁の文字列を数値に変換して返す( strパラメータ.Substring( k * 2, 2 ) );\r
-                                       if( num24 > 0 )\r
+                                       int nChipNo = ( nCh == 3 ) ? C変換.n16進数2桁の文字列を数値に変換して返す( strパラメータ.Substring( i * 2, 2 ) ) : C変換.n36進数2桁の文字列を数値に変換して返す( strパラメータ.Substring( i * 2, 2 ) );\r
+                                       if( nChipNo > 0 )\r
                                        {\r
                                                Cチップ cチップ3 = new Cチップ();\r
                                                cチップ3.nチャンネル番号00toFF = nCh;\r
                                                cチップ3.nレーン番号0to = num20;\r
-                                               cチップ3.n位置grid = k;\r
-                                               cチップ3.n読み込み時の解像度 = num22;\r
-                                               cチップ3.n値・整数1to1295 = num24;\r
+                                               cチップ3.n位置grid = i;\r
+                                               cチップ3.n読み込み時の解像度 = nChips;\r
+                                               cチップ3.n値・整数1to1295 = nChipNo;\r
                                                cチップ3.b裏 = flag;\r
                                                c小節3.listチップ.Add( cチップ3 );\r
                                        }\r
@@ -1274,7 +1276,7 @@ namespace DTXCreator
                                                return 0x13;\r
 \r
                                        case "HT":\r
-                                               return 20;\r
+                                               return 0x14;\r
 \r
                                        case "LT":\r
                                                return 0x15;\r
@@ -1304,7 +1306,7 @@ namespace DTXCreator
                                                return 0x27;\r
 \r
                                        case "GW":\r
-                                               return 40;\r
+                                               return 0x28;\r
 \r
                                        case "01":\r
                                                return 0x61;\r
@@ -1316,7 +1318,7 @@ namespace DTXCreator
                                                return 0x63;\r
 \r
                                        case "04":\r
-                                               return 100;\r
+                                               return 0x64;\r
 \r
                                        case "05":\r
                                                return 0x65;\r
@@ -1358,7 +1360,7 @@ namespace DTXCreator
                                                return 0x77;\r
 \r
                                        case "12":\r
-                                               return 120;\r
+                                               return 0x78;\r
 \r
                                        case "13":\r
                                                return 0x79;\r
@@ -1370,7 +1372,7 @@ namespace DTXCreator
                                                return 0x81;\r
 \r
                                        case "16":\r
-                                               return 130;\r
+                                               return 0x82;\r
 \r
                                        case "17":\r
                                                return 0x83;\r
@@ -1430,7 +1432,7 @@ namespace DTXCreator
                                                return 0x20;\r
 \r
                                        case "B0":\r
-                                               return 160;\r
+                                               return 0xa0;\r
                                }\r
                        }\r
                        return -1;\r
@@ -1526,7 +1528,7 @@ namespace DTXCreator
                private void tDTX出力・AVIリスト( StreamWriter sw )\r
                {\r
                        sw.WriteLine();\r
-                       for( int i = 1; i <= 0x50f; i++ )\r
+                       for( int i = 1; i <= 36 * 36 - 1; i++ )\r
                        {\r
                                CAVI cavi = this._Form.mgrAVIリスト管理者.tAVIをキャッシュから検索して返す( i );\r
                                if( ( cavi != null ) && ( cavi.strファイル名.Length > 0 ) )\r
@@ -1545,7 +1547,7 @@ namespace DTXCreator
                {\r
                        Color color = ColorTranslator.FromHtml( "window" );\r
                        Color color2 = ColorTranslator.FromHtml( "windowtext" );\r
-                       for( int i = 1; i <= 0x50f; i++ )\r
+                       for( int i = 1; i <= 36 * 36 - 1; i++ )\r
                        {\r
                                CAVI cavi = this._Form.mgrAVIリスト管理者.tAVIをキャッシュから検索して返す( i );\r
                                if( cavi != null )\r
@@ -1564,7 +1566,7 @@ namespace DTXCreator
                private void tDTX出力・BMPリスト( StreamWriter sw )\r
                {\r
                        sw.WriteLine();\r
-                       for( int i = 1; i <= 0x50f; i++ )\r
+                       for( int i = 1; i <= 36 * 36 - 1; i++ )\r
                        {\r
                                CBMP cbmp = this._Form.mgrBMPリスト管理者.tBMPをキャッシュから検索して返す( i );\r
                                if( ( cbmp != null ) && ( cbmp.strファイル名.Length > 0 ) )\r
@@ -1595,7 +1597,7 @@ namespace DTXCreator
                {\r
                        Color color = ColorTranslator.FromHtml( "window" );\r
                        Color color2 = ColorTranslator.FromHtml( "windowtext" );\r
-                       for( int i = 1; i <= 0x50f; i++ )\r
+                       for( int i = 1; i <= 36 * 36 - 1; i++ )\r
                        {\r
                                CBMP cbmp = this._Form.mgrBMPリスト管理者.tBMPをキャッシュから検索して返す( i );\r
                                if( cbmp != null )\r
@@ -1622,7 +1624,7 @@ namespace DTXCreator
                private void tDTX出力・WAVリスト( StreamWriter sw, bool bBGMのみ出力 )\r
                {\r
                        sw.WriteLine();\r
-                       for( int i = 1; i <= 0x50f; i++ )\r
+                       for( int i = 1; i <= 36 * 36 - 1; i++ )\r
                        {\r
                                CWAV cwav = this._Form.mgrWAVリスト管理者.tWAVをキャッシュから検索して返す( i );\r
                                if( ( ( cwav != null ) && ( cwav.strファイル名.Length > 0 ) ) && ( !bBGMのみ出力 || cwav.bBGMとして使用 ) )\r
@@ -1653,7 +1655,7 @@ namespace DTXCreator
                {\r
                        Color color = ColorTranslator.FromHtml( "window" );\r
                        Color color2 = ColorTranslator.FromHtml( "windowtext" );\r
-                       for( int i = 1; i <= 0x50f; i++ )\r
+                       for( int i = 1; i <= 36 * 36 - 1; i++ )\r
                        {\r
                                CWAV cwav = this._Form.mgrWAVリスト管理者.tWAVをキャッシュから検索して返す( i );\r
                                if( cwav != null )\r