OSDN Git Service

#36043 rev.920 で手違いが起きたため、一度 rev.919 に戻し、ファイルを再修正。Ech定義の使用を CChip のプロパティを使うよう一部変更。
[dtxmania/dtxmania.git] / DTXManiaプロジェクト / コード / ステージ / 07.演奏 / ドラム画面 / CAct演奏DrumsWailingBonus.cs
index 58e1c35..b7e3a92 100644 (file)
@@ -14,32 +14,32 @@ namespace DTXMania
                {\r
                        base.b活性化してない = true;\r
                }\r
-\r
-\r
+               \r
+               \r
                // メソッド\r
 \r
                //public override void Start( E楽器パート part )\r
                //{\r
                //    this.Start( part, null );\r
                //}\r
-               public override void Start(E楽器パート part, CChip r歓声Chip)\r
+               public override void Start( E楽器パート part, CChip r歓声Chip )\r
                {\r
-                       if ((part == E楽器パート.GUITAR) || (part == E楽器パート.BASS))\r
+                       if( ( part == E楽器パート.GUITAR ) || ( part == E楽器パート.BASS ) )\r
                        {\r
-                               int num = (int)part;\r
-                               for (int i = 0; i < 4; i++)\r
+                               int num = (int) part;\r
+                               for( int i = 0; i < 4; i++ )\r
                                {\r
-                                       if (this.ct進行用[num, i].b停止中)\r
+                                       if( this.ct進行用[ num, i ].b停止中 )\r
                                        {\r
-                                               this.ct進行用[num, i] = new CCounter(0, 300, 2, CDTXMania.app.Timer);\r
-                                               if (CDTXMania.app.ConfigIni.b歓声を発声する)\r
+                                               this.ct進行用[ num, i ] = new CCounter( 0, 300, 2, CDTXMania.Instance.Timer );\r
+                                               if( CDTXMania.Instance.ConfigIni.b歓声を発声する )\r
                                                {\r
-                                                       if (r歓声Chip != null)\r
+                                                       if( r歓声Chip != null )\r
                                                        {\r
-                                                               CDTXMania.app.DTX.tチップの再生(r歓声Chip, CSound管理.rc演奏用タイマ.nシステム時刻, (int)Eレーン.BGM, CDTXMania.app.DTX.nモニタを考慮した音量(E楽器パート.UNKNOWN));\r
+                                                               CDTXMania.Instance.DTX.tチップの再生( r歓声Chip, CSound管理.rc演奏用タイマ.nシステム時刻, (int) Eレーン.BGM, CDTXMania.Instance.DTX.nモニタを考慮した音量( E楽器パート.UNKNOWN ) );\r
                                                                return;\r
                                                        }\r
-                                                       CDTXMania.app.Skin.sound歓声音.t再生する();\r
+                                                       CDTXMania.Instance.Skin.sound歓声音.t再生する();\r
                                                        return;\r
                                                }\r
                                                break;\r
@@ -53,22 +53,22 @@ namespace DTXMania
 \r
                public override void On活性化()\r
                {\r
-                       for (int i = 0; i < 3; i++)\r
+                       for( int i = 0; i < 3; i++ )\r
                        {\r
-                               for (int j = 0; j < 4; j++)\r
+                               for( int j = 0; j < 4; j++ )\r
                                {\r
-                                       this.ct進行用[i, j] = new CCounter();\r
+                                       this.ct進行用[ i, j ] = new CCounter();\r
                                }\r
                        }\r
                        base.On活性化();\r
                }\r
                public override void On非活性化()\r
                {\r
-                       for (int i = 0; i < 3; i++)\r
+                       for( int i = 0; i < 3; i++ )\r
                        {\r
-                               for (int j = 0; j < 4; j++)\r
+                               for( int j = 0; j < 4; j++ )\r
                                {\r
-                                       this.ct進行用[i, j] = null;\r
+                                       this.ct進行用[ i, j ] = null;\r
                                }\r
                        }\r
                        base.On非活性化();\r
@@ -76,70 +76,70 @@ namespace DTXMania
 \r
                public override int On進行描画()\r
                {\r
-                       if (!base.b活性化してない)\r
+                       if( !base.b活性化してない )\r
                        {\r
-                               for (int i = 0; i < 2; i++)\r
+                               for( int i = 0; i < 2; i++ )\r
                                {\r
-                                       E楽器パート e楽器パート = (i == 0) ? E楽器パート.GUITAR : E楽器パート.BASS;\r
-                                       for (int j = 0; j < 4; j++)\r
+                                       E楽器パート e楽器パート = ( i == 0 ) ? E楽器パート.GUITAR : E楽器パート.BASS;\r
+                                       for( int j = 0; j < 4; j++ )\r
                                        {\r
-                                               if (!this.ct進行用[(int)e楽器パート, j].b停止中)\r
+                                               if( !this.ct進行用[ (int) e楽器パート, j ].b停止中 )\r
                                                {\r
-                                                       if (this.ct進行用[(int)e楽器パート, j].b終了値に達した)\r
+                                                       if( this.ct進行用[ (int) e楽器パート, j ].b終了値に達した )\r
                                                        {\r
-                                                               this.ct進行用[(int)e楽器パート, j].t停止();\r
+                                                               this.ct進行用[ (int) e楽器パート, j ].t停止();\r
                                                        }\r
                                                        else\r
                                                        {\r
-                                                               this.ct進行用[(int)e楽器パート, j].t進行();\r
-                                                               int x = ((e楽器パート == E楽器パート.GUITAR) ? 1521 + 234 : 1194 + 234);\r
-                                                               if (CDTXMania.app.ConfigIni.eドラムレーン表示位置 == Eドラムレーン表示位置.Center)\r
+                                                               this.ct進行用[ (int) e楽器パート, j ].t進行();\r
+                                                               int x = ( ( e楽器パート == E楽器パート.GUITAR ) ? 1521+234 : 1194+234 );\r
+                                                               if (CDTXMania.Instance.ConfigIni.eドラムレーン表示位置 == Eドラムレーン表示位置.Center)\r
                                                                {\r
-                                                                       x -= (e楽器パート == E楽器パート.GUITAR) ? 71 : 994;\r
+                                                                       x -= ( e楽器パート == E楽器パート.GUITAR ) ? 71 : 994;\r
                                                                }\r
                                                                int num4 = 0;\r
                                                                int num5 = 0;\r
-                                                               int num6 = this.ct進行用[(int)e楽器パート, j].n現在の値;\r
-                                                               if (num6 < 100)\r
+                                                               int num6 = this.ct進行用[ (int) e楽器パート, j ].n現在の値;\r
+                                                               if( num6 < 100 )\r
                                                                {\r
-                                                                       num4 = (int)(64.0 + (290.0 * Math.Cos(Math.PI / 2 * (((float)num6) / 100f))));\r
+                                                                       num4 = (int) ( 64.0 + ( 290.0 * Math.Cos( Math.PI / 2 * ( ( (float) num6 ) / 100f ) ) ) );\r
                                                                }\r
-                                                               else if (num6 < 150)\r
+                                                               else if( num6 < 150 )\r
                                                                {\r
-                                                                       num4 = (int)(64.0 + ((150 - num6) * Math.Sin((Math.PI * ((num6 - 100) % 0x19)) / 25.0)));\r
+                                                                       num4 = (int) ( 64.0 + ( ( 150 - num6 ) * Math.Sin( ( Math.PI * ( ( num6 - 100 ) % 0x19 ) ) / 25.0 ) ) );\r
                                                                }\r
-                                                               else if (num6 < 200)\r
+                                                               else if( num6 < 200 )\r
                                                                {\r
                                                                        num4 = 0x40;\r
                                                                }\r
                                                                else\r
                                                                {\r
-                                                                       num4 = (int)(64f - (((float)(290 * (num6 - 200))) / 100f));\r
+                                                                       num4 = (int) ( 64f - ( ( (float) ( 290 * ( num6 - 200 ) ) ) / 100f ) );\r
                                                                }\r
-                                                               if (CDTXMania.app.ConfigIni.bReverse[(int)e楽器パート])\r
+                                                               if( CDTXMania.Instance.ConfigIni.bReverse[ (int) e楽器パート ] )\r
                                                                {\r
-                                                                       num4 = (0x163 - num4) - 0xf4;\r
+                                                                       num4 = ( 0x163 - num4 ) - 0xf4;\r
                                                                }\r
-                                                               Rectangle rectangle = new Rectangle(0, 0, 0x1a, 0x7a * 2);\r
-                                                               if ((0x163 - num4) < rectangle.Bottom)\r
+                                                               Rectangle rectangle = new Rectangle( 0, 0, 0x1a, 0x7a * 2 );\r
+                                                               if ( ( 0x163 - num4 ) < rectangle.Bottom )\r
                                                                {\r
-                                                                       rectangle.Height = (0x163 - num4) - rectangle.Top;\r
+                                                                       rectangle.Height = ( 0x163 - num4 ) - rectangle.Top;\r
                                                                }\r
-                                                               if (num4 < 0)\r
+                                                               if( num4 < 0 )\r
                                                                {\r
                                                                        rectangle.Y = -num4;\r
                                                                        num5 = -num4;\r
                                                                }\r
-                                                               if ((rectangle.Top < rectangle.Bottom) && (this.txWailingBonus != null))\r
+                                                               if ( ( rectangle.Top < rectangle.Bottom ) && ( this.txWailingBonus != null ) )\r
                                                                {\r
-                                                                       rectangle.X = (int)(rectangle.X * Scale.X);\r
-                                                                       rectangle.Y = (int)(rectangle.Y * Scale.Y);\r
-                                                                       rectangle.Width = (int)(rectangle.Width * Scale.X);\r
-                                                                       rectangle.Height = (int)(rectangle.Height * Scale.Y);\r
+                                                                       rectangle.X = (int) ( rectangle.X * Scale.X );\r
+                                                                       rectangle.Y = (int) ( rectangle.Y * Scale.Y );\r
+                                                                       rectangle.Width = (int) ( rectangle.Width * Scale.X );\r
+                                                                       rectangle.Height = (int) ( rectangle.Height * Scale.Y );\r
                                                                        this.txWailingBonus.t2D描画(\r
-                                                                               CDTXMania.app.Device,\r
+                                                                               CDTXMania.Instance.Device,\r
                                                                                x,\r
-                                                                               ((((e楽器パート == E楽器パート.GUITAR) ? 0x39 : 0x39) + num4) + num5) * Scale.Y,\r
+                                                                               ( ( ( ( e楽器パート == E楽器パート.GUITAR ) ? 0x39 : 0x39 ) + num4 ) + num5 ) * Scale.Y,\r
                                                                                rectangle\r
                                                                        );\r
                                                                }\r
@@ -156,7 +156,7 @@ namespace DTXMania
                                                                //}\r
                                                                //if( ( rectangle.Top < rectangle.Bottom ) && ( this.txWailingBonus != null ) )\r
                                                                //{\r
-                                                               //    this.txWailingBonus.t2D描画( CDTXMania.app.Device, x, ( ( ( ( e楽器パート == E楽器パート.GUITAR ) ? 0x39 : 0x39 ) + num4 ) + num5 ) + 0x7a, rectangle );\r
+                                                               //    this.txWailingBonus.t2D描画( CDTXMania.Instance.app.Device, x, ( ( ( ( e楽器パート == E楽器パート.GUITAR ) ? 0x39 : 0x39 ) + num4 ) + num5 ) + 0x7a, rectangle );\r
                                                                //}\r
                                                        }\r
                                                }\r