OSDN Git Service

#24820 CONFIGURATIONとConfig.iniから、AdjustWavesを削除。ならびにCConfig.csのregion付け。
authoryyagi <yyagi@16f42ceb-6dc6-49c8-ba94-f2d53467949d>
Tue, 1 Jan 2013 12:26:40 +0000 (12:26 +0000)
committeryyagi <yyagi@16f42ceb-6dc6-49c8-ba94-f2d53467949d>
Tue, 1 Jan 2013 12:26:40 +0000 (12:26 +0000)
git-svn-id: http://svn.osdn.jp/svnroot/dtxmania/branches/130101(DTXMania%20with%20%2324820SoundTimerVer)@483 16f42ceb-6dc6-49c8-ba94-f2d53467949d

DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CActConfigList.cs
DTXManiaプロジェクト/コード/全体/CConfigIni.cs
実行時フォルダ/DTXManiaGR.exe
実行時フォルダ/FDK.dll

index f802802..8bfeb1e 100644 (file)
@@ -107,10 +107,10 @@ namespace DTXMania
 \r
 \r
        \r
-                       this.iSystemAdjustWaves = new CItemToggle( "AdjustWaves", CDTXMania.ConfigIni.bWave再生位置自動調整機能有効,\r
-                               "サウンド再生位置自動補正:\nハードウェアやOSに起因するサウン\nドのずれを強制的に補正します。\nBGM のように再生時間の長い音声\nデータが使用されている曲で効果が\nあります。",\r
-                               "Automatic wave playing position\n adjustment feature. If you turn it ON,\n it decrease the lag which comes from\n the difference of hardware/OS.\nUsually, you should turn it ON." );\r
-                       this.list項目リスト.Add( this.iSystemAdjustWaves );\r
+                       //this.iSystemAdjustWaves = new CItemToggle( "AdjustWaves", CDTXMania.ConfigIni.bWave再生位置自動調整機能有効,\r
+                       //    "サウンド再生位置自動補正:\nハードウェアやOSに起因するサウン\nドのずれを強制的に補正します。\nBGM のように再生時間の長い音声\nデータが使用されている曲で効果が\nあります。",\r
+                       //    "Automatic wave playing position\n adjustment feature. If you turn it ON,\n it decrease the lag which comes from\n the difference of hardware/OS.\nUsually, you should turn it ON." );\r
+                       //this.list項目リスト.Add( this.iSystemAdjustWaves );\r
                        this.iSystemVSyncWait = new CItemToggle( "VSyncWait", CDTXMania.ConfigIni.b垂直帰線待ちを行う,\r
                                "垂直帰線同期:\n画面の描画をディスプレイの垂直帰\n線中に行なう場合には ON を指定し\nます。ON にすると、ガタつきのない\n滑らかな画面描画が実現されます。",\r
                                "Turn ON to wait VSync (Vertical\n Synchronizing signal) at every\n drawings. (so FPS becomes 60)\nIf you have enough CPU/GPU power,\n the scroll would become smooth." );\r
@@ -1719,7 +1719,7 @@ namespace DTXMania
                private CItemBase iKeyAssignGuitarReturnToMenu;\r
                private CItemBase iKeyAssignGuitarWail;\r
                private CItemToggle iLogOutputLog;\r
-               private CItemToggle iSystemAdjustWaves;\r
+//             private CItemToggle iSystemAdjustWaves;\r
                private CItemToggle iSystemAudienceSound;\r
                private CItemInteger iSystemAutoChipVolume;\r
                private CItemToggle iSystemAVI;\r
@@ -1927,7 +1927,7 @@ namespace DTXMania
                        CDTXMania.ConfigIni.bSTAGEFAILED有効 = this.iSystemStageFailed.bON;\r
                        CDTXMania.ConfigIni.bランダムセレクトで子BOXを検索対象とする = this.iSystemRandomFromSubBox.bON;\r
 \r
-                       CDTXMania.ConfigIni.bWave再生位置自動調整機能有効 = this.iSystemAdjustWaves.bON;\r
+//                     CDTXMania.ConfigIni.bWave再生位置自動調整機能有効 = this.iSystemAdjustWaves.bON;\r
                        CDTXMania.ConfigIni.b垂直帰線待ちを行う = this.iSystemVSyncWait.bON;\r
                        CDTXMania.ConfigIni.bバッファ入力を行う = this.iSystemBufferedInput.bON;\r
                        CDTXMania.ConfigIni.bAVI有効 = this.iSystemAVI.bON;\r
index 4404329..714d81f 100644 (file)
@@ -442,7 +442,7 @@ namespace DTXMania
                public STDGBVALUE<bool> bSudden;\r
                public bool bTight;\r
                public STDGBVALUE<bool> bGraph;     // #24074 2011.01.23 add ikanick\r
-               public bool bWave再生位置自動調整機能有効;\r
+//             public bool bWave再生位置自動調整機能有効;\r
                public bool bシンバルフリー;\r
                public bool bストイックモード;\r
                public bool bドラム打音を発声する;\r
@@ -1025,7 +1025,7 @@ namespace DTXMania
                        this.bフィルイン有効 = true;\r
                        this.n曲が選択されてからプレビュー音が鳴るまでのウェイトms = 1000;\r
                        this.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms = 100;\r
-                       this.bWave再生位置自動調整機能有効 = true;\r
+//                     this.bWave再生位置自動調整機能有効 = true;\r
                        this.bBGM音を発声する = true;\r
                        this.bドラム打音を発声する = true;\r
                        this.b歓声を発声する = true;\r
@@ -1172,18 +1172,20 @@ namespace DTXMania
                        sw.WriteLine();\r
        //------------------------------\r
 #endif\r
-\r
+                       #region [ Version ]\r
                        sw.WriteLine( "; リリースバージョン" );\r
                        sw.WriteLine( "; Release Version." );\r
                        sw.WriteLine( "Version={0}", CDTXMania.VERSION );\r
                        sw.WriteLine();\r
+                       #endregion\r
+                       #region [ DTXPath ]\r
                        sw.WriteLine( "; 演奏データの格納されているフォルダへのパス。" );\r
                        sw.WriteLine( @"; セミコロン(;)で区切ることにより複数のパスを指定できます。(例: d:\DTXFiles1\;e:\DTXFiles2\)" );\r
                        sw.WriteLine( "; Pathes for DTX data." );\r
                        sw.WriteLine( @"; You can specify many pathes separated with semicolon(;). (e.g. d:\DTXFiles1\;e:\DTXFiles2\)" );\r
                        sw.WriteLine( "DTXPath={0}", this.str曲データ検索パス );\r
                        sw.WriteLine();\r
-\r
+                       #endregion\r
                        #region [ スキン関連 ]\r
                        #region [ Skinパスの絶対パス→相対パス変換 ]\r
                        Uri uriRoot = new Uri( System.IO.Path.Combine( CDTXMania.strEXEのあるフォルダ, "System" + System.IO.Path.DirectorySeparatorChar ) );\r
@@ -1233,6 +1235,10 @@ namespace DTXMania
                        sw.WriteLine("; 垂直帰線同期(0:OFF,1:ON)");\r
                        sw.WriteLine( "VSyncWait={0}", this.b垂直帰線待ちを行う ? 1 : 0 );\r
             sw.WriteLine();\r
+                       sw.WriteLine( "; フレーム毎のsleep値[ms] (-1でスリープ無し, 0以上で毎フレームスリープ。動画キャプチャ等で活用下さい)" );       // #xxxxx 2011.11.27 yyagi add\r
+                       sw.WriteLine( "; A sleep time[ms] per frame." );                                                        //\r
+                       sw.WriteLine( "SleepTimePerFrame={0}", this.nフレーム毎スリープms );                   //\r
+                       sw.WriteLine();                                                                                                                 //\r
                        #region [ WASAPI/ASIO関連 ]\r
                        sw.WriteLine( "; サウンド出力方式(0=ACM(って今はまだDirectShowですが), 1=ASIO, 2=WASAPI)" );\r
                        sw.WriteLine( "; WASAPIはVista以降のOSで使用可能。推奨方式はWASAPI。" );\r
@@ -1250,11 +1256,7 @@ namespace DTXMania
                        sw.WriteLine( "ASIOBufferSize={0}", (int) this.nASIOBufferSize );\r
                        sw.WriteLine();\r
                        #endregion\r
-                       sw.WriteLine( "; フレーム毎のsleep値[ms] (-1でスリープ無し, 0以上で毎フレームスリープ。動画キャプチャ等で活用下さい)" );       // #xxxxx 2011.11.27 yyagi add\r
-                       sw.WriteLine( "; A sleep time[ms] per frame." );                                                        //\r
-                       sw.WriteLine( "SleepTimePerFrame={0}", this.nフレーム毎スリープms);                    //\r
-                       sw.WriteLine();                                                                                                                 //\r
-\r
+                       #region [ ギター/ベース/ドラム 有効/無効 ]\r
                        sw.WriteLine( "; ギター/ベース有効(0:OFF,1:ON)" );\r
                        sw.WriteLine( "; Enable Guitar/Bass or not.(0:OFF,1:ON)" );\r
                        sw.WriteLine( "Guitar={0}", this.bGuitar有効 ? 1 : 0 );\r
@@ -1263,6 +1265,7 @@ namespace DTXMania
                        sw.WriteLine( "; Enable Drums or not.(0:OFF,1:ON)" );\r
                        sw.WriteLine( "Drums={0}", this.bDrums有効 ? 1 : 0 );\r
                        sw.WriteLine();\r
+                       #endregion\r
                        sw.WriteLine( "; 背景画像の半透明割合(0:透明~255:不透明)" );\r
                        sw.WriteLine( "; Transparency for background image in playing screen.(0:tranaparent - 255:no transparent)" );\r
                        sw.WriteLine( "BGAlpha={0}", this.nBGAlpha );\r
@@ -1270,6 +1273,9 @@ namespace DTXMania
                        sw.WriteLine( "; Missヒット時のゲージ減少割合(0:少, 1:普通, 2:大)" );\r
                        sw.WriteLine( "DamageLevel={0}", (int) this.eダメージレベル );\r
                        sw.WriteLine();\r
+                       sw.WriteLine( "; ゲージゼロでSTAGE FAILED (0:OFF, 1:ON)" );\r
+                       sw.WriteLine( "StageFailed={0}", this.bSTAGEFAILED有効 ? 1 : 0 );\r
+                       sw.WriteLine();\r
                        #region [ 打ち分け関連 ]\r
                        sw.WriteLine( "; LC/HHC/HHO 打ち分けモード(0:LC|HHC|HHO, 1:LC&(HHC|HHO), 2:LC&HHC&HHO)" );\r
                        sw.WriteLine( "HHGroup={0}", (int) this.eHHGroup );\r
@@ -1292,43 +1298,52 @@ namespace DTXMania
                        sw.WriteLine( "; 打ち分け時の再生音の優先順位(CYGroup)(0:Chip>Pad, 1:Pad>Chip)" );\r
                        sw.WriteLine( "HitSoundPriorityCY={0}", (int) this.eHitSoundPriorityCY );\r
                        sw.WriteLine();\r
-                       #endregion\r
-                       sw.WriteLine( "; ゲージゼロでSTAGE FAILED (0:OFF, 1:ON)" );\r
-                       sw.WriteLine( "StageFailed={0}", this.bSTAGEFAILED有効 ? 1 : 0 );\r
+                       sw.WriteLine( "; シンバルフリーモード(0:OFF, 1:ON)" );\r
+                       sw.WriteLine( "CymbalFree={0}", this.bシンバルフリー ? 1 : 0 );\r
                        sw.WriteLine();\r
+                       #endregion\r
+                       #region [ AVI/BGA ]\r
                        sw.WriteLine( "; AVIの表示(0:OFF, 1:ON)" );\r
                        sw.WriteLine( "AVI={0}", this.bAVI有効 ? 1 : 0 );\r
                        sw.WriteLine();\r
                        sw.WriteLine( "; BGAの表示(0:OFF, 1:ON)" );\r
                        sw.WriteLine( "BGA={0}", this.bBGA有効 ? 1 : 0 );\r
                        sw.WriteLine();\r
+                       #endregion\r
+                       #region [ フィルイン ]\r
                        sw.WriteLine( "; フィルイン効果(0:OFF, 1:ON)" );\r
                        sw.WriteLine( "FillInEffect={0}", this.bフィルイン有効 ? 1 : 0 );\r
                        sw.WriteLine();\r
+                       sw.WriteLine( "; フィルイン達成時の歓声の再生(0:OFF, 1:ON)" );\r
+                       sw.WriteLine( "AudienceSound={0}", this.b歓声を発声する ? 1 : 0 );\r
+                       sw.WriteLine();\r
+                       #endregion\r
+                       #region [ プレビュー音 ]\r
                        sw.WriteLine( "; 曲選択からプレビュー音の再生までのウェイト[ms]" );\r
                        sw.WriteLine( "PreviewSoundWait={0}", this.n曲が選択されてからプレビュー音が鳴るまでのウェイトms );\r
                        sw.WriteLine();\r
                        sw.WriteLine( "; 曲選択からプレビュー画像表示までのウェイト[ms]" );\r
                        sw.WriteLine( "PreviewImageWait={0}", this.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms );\r
                        sw.WriteLine();\r
-                       sw.WriteLine( "; Waveの再生位置自動補正(0:OFF, 1:ON)" );\r
-                       sw.WriteLine( "AdjustWaves={0}", this.bWave再生位置自動調整機能有効 ? 1 : 0 );\r
+                       #endregion\r
+//                     sw.WriteLine( "; Waveの再生位置自動補正(0:OFF, 1:ON)" );\r
+//                     sw.WriteLine( "AdjustWaves={0}", this.bWave再生位置自動調整機能有効 ? 1 : 0 );\r
                        sw.WriteLine();\r
+                       #region [ BGM/ドラムヒット音の再生 ]\r
                        sw.WriteLine( "; BGM の再生(0:OFF, 1:ON)" );\r
                        sw.WriteLine( "BGMSound={0}", this.bBGM音を発声する ? 1 : 0 );\r
                        sw.WriteLine();\r
                        sw.WriteLine( "; ドラム打音の再生(0:OFF, 1:ON)" );\r
                        sw.WriteLine( "HitSound={0}", this.bドラム打音を発声する ? 1 : 0 );\r
                        sw.WriteLine();\r
-                       sw.WriteLine( "; フィルイン達成時の歓声の再生(0:OFF, 1:ON)" );\r
-                       sw.WriteLine( "AudienceSound={0}", this.b歓声を発声する ? 1 : 0 );\r
-                       sw.WriteLine();\r
+                       #endregion\r
                        sw.WriteLine( "; 演奏記録(~.score.ini)の出力 (0:OFF, 1:ON)" );\r
                        sw.WriteLine( "SaveScoreIni={0}", this.bScoreIniを出力する ? 1 : 0 );\r
                        sw.WriteLine();\r
                        sw.WriteLine( "; RANDOM SELECT で子BOXを検索対象に含める (0:OFF, 1:ON)" );\r
                        sw.WriteLine( "RandomFromSubBox={0}", this.bランダムセレクトで子BOXを検索対象とする ? 1 : 0 );\r
                        sw.WriteLine();\r
+                       #region [ モニターサウンド(ヒット音の再生音量アップ) ]\r
                        sw.WriteLine( "; ドラム演奏時にドラム音を強調する (0:OFF, 1:ON)" );\r
                        sw.WriteLine( "SoundMonitorDrums={0}", this.b演奏音を強調する.Drums ? 1 : 0 );\r
                        sw.WriteLine();\r
@@ -1338,6 +1353,8 @@ namespace DTXMania
                        sw.WriteLine( "; ベース演奏時にベース音を強調する (0:OFF, 1:ON)" );\r
                        sw.WriteLine( "SoundMonitorBass={0}", this.b演奏音を強調する.Bass ? 1 : 0 );\r
                        sw.WriteLine();\r
+                       #endregion\r
+                       #region [ コンボ表示数 ]\r
                        sw.WriteLine( "; ドラムの表示可能な最小コンボ数(1~99999)" );\r
                        sw.WriteLine( "MinComboDrums={0}", this.n表示可能な最小コンボ数.Drums );\r
                        sw.WriteLine();\r
@@ -1347,9 +1364,11 @@ namespace DTXMania
                        sw.WriteLine( "; ベースの表示可能な最小コンボ数(1~99999)" );\r
                        sw.WriteLine( "MinComboBass={0}", this.n表示可能な最小コンボ数.Bass );\r
                        sw.WriteLine();\r
+                       #endregion\r
                        sw.WriteLine( "; 演奏情報を表示する (0:OFF, 1:ON)" );\r
                        sw.WriteLine( "ShowDebugStatus={0}", this.b演奏情報を表示する ? 1 : 0 );\r
                        sw.WriteLine();\r
+                       #region [ 選曲リストのフォント ]\r
                        sw.WriteLine( "; 選曲リストのフォント名" );\r
                        sw.WriteLine( "SelectListFontName={0}", this.str選曲リストフォント );\r
                        sw.WriteLine();\r
@@ -1362,6 +1381,7 @@ namespace DTXMania
                        sw.WriteLine( "; 選曲リストのフォントを太字にする (0:OFF, 1:ON)" );\r
                        sw.WriteLine( "SelectListFontBold={0}", this.b選曲リストフォントを太字にする ? 1 : 0 );\r
                        sw.WriteLine();\r
+                       #endregion\r
                        sw.WriteLine( "; 打音の音量(0~100%)" );\r
                        sw.WriteLine( "ChipVolume={0}", this.n手動再生音量 );\r
                        sw.WriteLine();\r
@@ -1371,9 +1391,6 @@ namespace DTXMania
                        sw.WriteLine( "; ストイックモード(0:OFF, 1:ON)" );\r
                        sw.WriteLine( "StoicMode={0}", this.bストイックモード ? 1 : 0 );\r
                        sw.WriteLine();\r
-                       sw.WriteLine( "; シンバルフリーモード(0:OFF, 1:ON)" );\r
-                       sw.WriteLine( "CymbalFree={0}", this.bシンバルフリー ? 1 : 0 );\r
-                       sw.WriteLine();\r
                        sw.WriteLine( "; バッファ入力モード(0:OFF, 1:ON)" );\r
                        sw.WriteLine( "BufferedInput={0}", this.bバッファ入力を行う ? 1 : 0 );\r
                        sw.WriteLine();\r
@@ -1390,12 +1407,15 @@ namespace DTXMania
                        sw.WriteLine( "; when you get hiscore/hiskill.");                                                               //\r
                        sw.WriteLine( "AutoResultCapture={0}", this.bIsAutoResultCapture? 1 : 0 );              //\r
                        sw.WriteLine();\r
+                       #region [ InputAdjust ]\r
                        sw.WriteLine( "; 判定タイミング調整(ドラム, ギター, ベース)(-99~0)[ms]" );          // #23580 2011.1.3 yyagi\r
                        sw.WriteLine("; Revision value to adjust judgement timing for the drums, guitar and bass.");    //\r
                        sw.WriteLine("InputAdjustTimeDrums={0}", this.nInputAdjustTimeMs.Drums);                //\r
                        sw.WriteLine("InputAdjustTimeGuitar={0}", this.nInputAdjustTimeMs.Guitar);              //\r
                        sw.WriteLine("InputAdjustTimeBass={0}", this.nInputAdjustTimeMs.Bass);                  //\r
                        sw.WriteLine();\r
+                       #endregion\r
+                       #region [ VelocityMin ]\r
                        sw.WriteLine( "; LC, HH, SD,...の入力切り捨て下限Velocity値(0~127)" );                      // #23857 2011.1.31 yyagi\r
                        sw.WriteLine( "; Minimum velocity value for LC, HH, SD, ... to accept." );              //\r
                        sw.WriteLine( "LCVelocityMin={0}", this.nVelocityMin.LC );                                              //\r
@@ -1412,6 +1432,7 @@ namespace DTXMania
                        sw.WriteLine( "CYVelocityMin={0}", this.nVelocityMin.CY );                                              //\r
                        sw.WriteLine( "RDVelocityMin={0}", this.nVelocityMin.RD );                                              //\r
                        sw.WriteLine();                                                                                                                                 //\r
+                       #endregion\r
                        sw.WriteLine( ";-------------------" );\r
                        #endregion\r
                        #region [ Log ]\r
@@ -1850,14 +1871,19 @@ namespace DTXMania
                                                                                                else\r
                                                                                //----------------------------------------\r
 #endif\r
-                                                                                       if( str3.Equals( "Version" ) )\r
+                                                                                       #region [ Version ]\r
+                                                                                       if ( str3.Equals( "Version" ) )\r
                                                                                        {\r
                                                                                                this.strDTXManiaのバージョン = str4;\r
                                                                                        }\r
+                                                                                       #endregion\r
+                                                                                       #region [ DTXPath ]\r
                                                                                        else if( str3.Equals( "DTXPath" ) )\r
                                                                                        {\r
                                                                                                this.str曲データ検索パス = str4;\r
                                                                                        }\r
+                                                                                       #endregion\r
+                                                                                       #region [ skin関係 ]\r
                                                                                        else if ( str3.Equals( "SkinPath" ) )\r
                                                                                        {\r
                                                                                                string absSkinPath = str4;\r
@@ -1880,6 +1906,8 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.bUseBoxDefSkin = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
+                                                                                       #endregion\r
+                                                                                       #region [ Window関係 ]\r
                                                                                        else if ( str3.Equals( "FullScreen" ) )\r
                                                                                        {\r
                                                                                                this.b全画面モード = C変換.bONorOFF( str4[ 0 ] );\r
@@ -1908,6 +1936,12 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.bIsEnabledSystemMenu = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
+                                                                                       else if ( str3.Equals( "BackSleep" ) )                          // #23568 2010.11.04 ikanick add\r
+                                                                                       {\r
+                                                                                               this.n非フォーカス時スリープms = C変換.n値を文字列から取得して範囲内にちゃんと丸めて返す( str4, 0, 50, this.n非フォーカス時スリープms );\r
+                                                                                       }\r
+                                                                                       #endregion\r
+                                                                                       #region [ WASAPI/ASIO関係 ]\r
                                                                                        else if ( str3.Equals( "SoundDeviceType" ) )\r
                                                                                        {\r
                                                                                                this.nSoundDeviceType = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 2, this.nSoundDeviceType );\r
@@ -1916,18 +1950,16 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.nASIOBufferSize = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 9999, this.nASIOBufferSize );\r
                                                                                        }\r
+                                                                                       #endregion\r
                                                                                        else if ( str3.Equals( "VSyncWait" ) )\r
                                                                                        {\r
                                                                                                this.b垂直帰線待ちを行う = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
-                                                                                       else if( str3.Equals( "BackSleep" ) )                           // #23568 2010.11.04 ikanick add\r
-                                                                                       {\r
-                                                                                               this.n非フォーカス時スリープms = C変換.n値を文字列から取得して範囲内にちゃんと丸めて返す( str4, 0, 50, this.n非フォーカス時スリープms );\r
-                                                                                       }\r
                                                                                        else if( str3.Equals( "SleepTimePerFrame" ) )           // #23568 2011.11.27 yyagi\r
                                                                                        {\r
                                                                                                this.nフレーム毎スリープms = C変換.n値を文字列から取得して範囲内にちゃんと丸めて返す( str4, -1, 50, this.nフレーム毎スリープms );\r
                                                                                        }\r
+                                                                                       #region [ ギター/ベース/ドラム 有効/無効 ]\r
                                                                                        else if( str3.Equals( "Guitar" ) )\r
                                                                                        {\r
                                                                                                this.bGuitar有効 = C変換.bONorOFF( str4[ 0 ] );\r
@@ -1936,6 +1968,7 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.bDrums有効 = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
+                                                                                       #endregion\r
                                                                                        else if( str3.Equals( "BGAlpha" ) )\r
                                                                                        {\r
                                                                                                this.n背景の透過度 = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 0xff, this.n背景の透過度 );\r
@@ -1944,6 +1977,11 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.eダメージレベル = (Eダメージレベル) C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 2, (int) this.eダメージレベル );\r
                                                                                        }\r
+                                                                                       else if ( str3.Equals( "StageFailed" ) )\r
+                                                                                       {\r
+                                                                                               this.bSTAGEFAILED有効 = C変換.bONorOFF( str4[ 0 ] );\r
+                                                                                       }\r
+                                                                                       #region [ 打ち分け関連 ]\r
                                                                                        else if( str3.Equals( "HHGroup" ) )\r
                                                                                        {\r
                                                                                                this.eHHGroup = (EHHGroup) C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 3, (int) this.eHHGroup );\r
@@ -1972,10 +2010,12 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.eHitSoundPriorityCY = (E打ち分け時の再生の優先順位) C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 1, (int) this.eHitSoundPriorityCY );\r
                                                                                        }\r
-                                                                                       else if( str3.Equals( "StageFailed" ) )\r
+                                                                                       else if ( str3.Equals( "CymbalFree" ) )\r
                                                                                        {\r
-                                                                                               this.bSTAGEFAILED有効 = C変換.bONorOFF( str4[ 0 ] );\r
+                                                                                               this.bシンバルフリー = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
+                                                                                       #endregion\r
+                                                                                       #region [ AVI/BGA ]\r
                                                                                        else if( str3.Equals( "AVI" ) )\r
                                                                                        {\r
                                                                                                this.bAVI有効 = C変換.bONorOFF( str4[ 0 ] );\r
@@ -1984,10 +2024,18 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.bBGA有効 = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
-                                                                                       else if( str3.Equals( "FillInEffect" ) )\r
+                                                                                       #endregion\r
+                                                                                       #region [ フィルイン関係 ]\r
+                                                                                       else if ( str3.Equals( "FillInEffect" ) )\r
                                                                                        {\r
                                                                                                this.bフィルイン有効 = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
+                                                                                       else if ( str3.Equals( "AudienceSound" ) )\r
+                                                                                       {\r
+                                                                                               this.b歓声を発声する = C変換.bONorOFF( str4[ 0 ] );\r
+                                                                                       }\r
+                                                                                       #endregion\r
+                                                                                       #region [ プレビュー音 ]\r
                                                                                        else if( str3.Equals( "PreviewSoundWait" ) )\r
                                                                                        {\r
                                                                                                this.n曲が選択されてからプレビュー音が鳴るまでのウェイトms = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 0x5f5e0ff, this.n曲が選択されてからプレビュー音が鳴るまでのウェイトms );\r
@@ -1996,10 +2044,12 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 0x5f5e0ff, this.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms );\r
                                                                                        }\r
-                                                                                       else if( str3.Equals( "AdjustWaves" ) )\r
-                                                                                       {\r
-                                                                                               this.bWave再生位置自動調整機能有効 = C変換.bONorOFF( str4[ 0 ] );\r
-                                                                                       }\r
+                                                                                       #endregion\r
+                                                                                       //else if( str3.Equals( "AdjustWaves" ) )\r
+                                                                                       //{\r
+                                                                                       //    this.bWave再生位置自動調整機能有効 = C変換.bONorOFF( str4[ 0 ] );\r
+                                                                                       //}\r
+                                                                                       #region [ BGM/ドラムのヒット音 ]\r
                                                                                        else if( str3.Equals( "BGMSound" ) )\r
                                                                                        {\r
                                                                                                this.bBGM音を発声する = C変換.bONorOFF( str4[ 0 ] );\r
@@ -2008,10 +2058,7 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.bドラム打音を発声する = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
-                                                                                       else if( str3.Equals( "AudienceSound" ) )\r
-                                                                                       {\r
-                                                                                               this.b歓声を発声する = C変換.bONorOFF( str4[ 0 ] );\r
-                                                                                       }\r
+                                                                                       #endregion\r
                                                                                        else if( str3.Equals( "SaveScoreIni" ) )\r
                                                                                        {\r
                                                                                                this.bScoreIniを出力する = C変換.bONorOFF( str4[ 0 ] );\r
@@ -2020,6 +2067,7 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.bランダムセレクトで子BOXを検索対象とする = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
+                                                                                       #region [ SoundMonitor ]\r
                                                                                        else if( str3.Equals( "SoundMonitorDrums" ) )\r
                                                                                        {\r
                                                                                                this.b演奏音を強調する.Drums = C変換.bONorOFF( str4[ 0 ] );\r
@@ -2032,6 +2080,8 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.b演奏音を強調する.Bass = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
+                                                                                       #endregion\r
+                                                                                       #region [ コンボ数 ]\r
                                                                                        else if( str3.Equals( "MinComboDrums" ) )\r
                                                                                        {\r
                                                                                                this.n表示可能な最小コンボ数.Drums = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 1, 0x1869f, this.n表示可能な最小コンボ数.Drums );\r
@@ -2044,10 +2094,12 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.n表示可能な最小コンボ数.Bass = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 1, 0x1869f, this.n表示可能な最小コンボ数.Bass );\r
                                                                                        }\r
+                                                                                       #endregion\r
                                                                                        else if( str3.Equals( "ShowDebugStatus" ) )\r
                                                                                        {\r
                                                                                                this.b演奏情報を表示する = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
+                                                                                       #region [ 選曲リストフォント ]\r
                                                                                        else if( str3.Equals( "SelectListFontName" ) )\r
                                                                                        {\r
                                                                                                this.str選曲リストフォント = str4;\r
@@ -2064,6 +2116,7 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.b選曲リストフォントを太字にする = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
+                                                                                       #endregion\r
                                                                                        else if( str3.Equals( "ChipVolume" ) )\r
                                                                                        {\r
                                                                                                this.n手動再生音量 = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 100, this.n手動再生音量 );\r
@@ -2076,10 +2129,6 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.bストイックモード = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
-                                                                                       else if( str3.Equals( "CymbalFree" ) )\r
-                                                                                       {\r
-                                                                                               this.bシンバルフリー = C変換.bONorOFF( str4[ 0 ] );\r
-                                                                                       }\r
                                                                                        else if( str3.Equals( "ShowLagTime" ) )                         // #25370 2011.6.3 yyagi\r
                                                                                        {\r
                                                                                                this.nShowLagType = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 2, this.nShowLagType );\r
@@ -2088,6 +2137,7 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.bIsAutoResultCapture = C変換.bONorOFF( str4[ 0 ] );\r
                                                                                        }\r
+                                                                                       #region [ InputAdjustTime ]\r
                                                                                        else if( str3.Equals( "InputAdjustTimeDrums" ) )                // #23580 2011.1.3 yyagi\r
                                                                                        {\r
                                                                                                this.nInputAdjustTimeMs.Drums = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, -99, 0, this.nInputAdjustTimeMs.Drums );\r
@@ -2100,6 +2150,7 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.nInputAdjustTimeMs.Bass = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, -99, 0, this.nInputAdjustTimeMs.Bass );\r
                                                                                        }\r
+                                                                                       #endregion\r
                                                                                        else if( str3.Equals( "BufferedInput" ) )\r
                                                                                        {\r
                                                                                                this.bバッファ入力を行う = C変換.bONorOFF( str4[ 0 ] );\r
@@ -2108,6 +2159,7 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.nPoliphonicSounds = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 1, 8, this.nPoliphonicSounds );\r
                                                                                        }\r
+                                                                                       #region [ VelocityMin ]\r
                                                                                        else if ( str3.Equals( "LCVelocityMin" ) )                      // #23857 2010.12.12 yyagi\r
                                                                                        {\r
                                                                                                this.nVelocityMin.LC = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 127, this.nVelocityMin.LC );\r
@@ -2144,6 +2196,7 @@ namespace DTXMania
                                                                                        {\r
                                                                                                this.nVelocityMin.RD = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 127, this.nVelocityMin.RD );\r
                                                                                        }\r
+                                                                                       #endregion\r
                                                                                        continue;\r
                                                                                }\r
                                                                        //-----------------------------\r
index e739c1a..27d07e9 100644 (file)
Binary files a/実行時フォルダ/DTXManiaGR.exe and b/実行時フォルダ/DTXManiaGR.exe differ
index eda27e3..738e4ac 100644 (file)
Binary files a/実行時フォルダ/FDK.dll and b/実行時フォルダ/FDK.dll differ