#36693 Fixed #BACKGROUND related behaviour;

1) #BACKGROUND_GR will be applied only when GRmode.
3) background image will be scaled to full window size.

diff --git a/DTXManiaプロジェクト/コード/ステージ/07.演奏/CStage演奏画面共通_描画.cs b/DTXManiaプロジェクト/コード/ステージ/07.演奏/CStage演奏画面共通_描画.cs
index e4ffd99..84b8d35 100644 (file)
--- a/DTXManiaプロジェクト/コード/ステージ/07.演奏/CStage演奏画面共通_描画.cs
+++ b/DTXManiaプロジェクト/コード/ステージ/07.演奏/CStage演奏画面共通_描画.cs
@@ -448,13 +448,13 @@ namespace DTXMania
                {\r
                        string bgfilename = null;\r
 \r
-                       if ((CDTXMania.Instance.DTX.BACKGROUND != null) && (CDTXMania.Instance.DTX.BACKGROUND.Length > 0))\r
+                       if ((CDTXMania.Instance.ConfigIni.b楽器有効(EPart.Drums) == false) &&  (CDTXMania.Instance.DTX.BACKGROUND_GR != null) && (CDTXMania.Instance.DTX.BACKGROUND_GR.Length > 0))\r
                        {\r
-                               bgfilename = CDTXMania.Instance.DTX.BACKGROUND;\r
+                               bgfilename = CDTXMania.Instance.DTX.BACKGROUND_GR;\r
                        }\r
-                       else if ((CDTXMania.Instance.DTX.BACKGROUND_GR != null) && (CDTXMania.Instance.DTX.BACKGROUND_GR.Length > 0))\r
+                       else if ((CDTXMania.Instance.DTX.BACKGROUND != null) && (CDTXMania.Instance.DTX.BACKGROUND.Length > 0))\r
                        {\r
-                               bgfilename = CDTXMania.Instance.DTX.BACKGROUND_GR;\r
+                               bgfilename = CDTXMania.Instance.DTX.BACKGROUND;\r
                        }\r
 \r
                        if (bgfilename != null && bgfilename.Length > 0)\r
@@ -468,8 +468,8 @@ namespace DTXMania
                                {\r
                                        using (Bitmap originalBackground = new Bitmap(bgfilename))\r
                                        {\r
-                                               int W = originalBackground.Width;\r
-                                               int H = originalBackground.Height;\r
+                                               float W = originalBackground.Width;\r
+                                               float H = originalBackground.Height;\r
 \r
                                                float mag = 1;\r
                                                // VGA補正\r
@@ -501,14 +501,11 @@ namespace DTXMania
                                                #region [ BGA領域黒抜き・テクスチャ変換・Full再生透明度 ]\r
                                                if ((CDTXMania.Instance.DTX.listBMP.Count > 0) || (CDTXMania.Instance.DTX.listBMPTEX.Count > 0) || CDTXMania.Instance.DTX.listAVI.Count > 0)\r
                                                {\r
-                                                       using (Graphics graphics2 = Graphics.FromImage(image))\r
-                                                       {\r
-                                                               graphics2.FillRectangle(Brushes.Black,\r
-                                                                       new Rectangle(\r
-                                                                               CDTXMania.Instance.ConfigIni.cdMovieX[CDTXMania.Instance.ConfigIni.eActiveInst],\r
-                                                                               CDTXMania.Instance.ConfigIni.cdMovieY[CDTXMania.Instance.ConfigIni.eActiveInst],\r
-                                                                               CDTXMania.Instance.Coordinates.Movie.W, CDTXMania.Instance.Coordinates.Movie.H));\r
-                                                       }\r
+                                                       graphics3.FillRectangle(Brushes.Black,\r
+                                                               new Rectangle(\r
+                                                                       CDTXMania.Instance.ConfigIni.cdMovieX[CDTXMania.Instance.ConfigIni.eActiveInst],\r
+                                                                       CDTXMania.Instance.ConfigIni.cdMovieY[CDTXMania.Instance.ConfigIni.eActiveInst],\r
+                                                                       CDTXMania.Instance.Coordinates.Movie.W, CDTXMania.Instance.Coordinates.Movie.H));\r
                                                }\r
                                                #endregion\r
                                        }\r

diff --git a/実行時フォルダ/DTXManiaGR.exe b/実行時フォルダ/DTXManiaGR.exe
index 6076ac6..5c1bd81 100644 (file)
Binary files a/実行時フォルダ/DTXManiaGR.exe and b/実行時フォルダ/DTXManiaGR.exe differ