Minor tweaks

bradharding · Oct 13, 2023 · d9970bd · d9970bd
1 parent 160ec98
commit d9970bd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/i_video.c b/src/i_video.c
@@ -1316,7 +1316,7 @@ static void SetVideoMode(const bool createwindow, const bool output)
                 char    *temp1 = commify(width);
                 char    *temp2 = commify(height);
 
-                C_Output("The native desktop resolution of %sx%s, with an aspect ratio of %s, is being used.",
+                C_Output("The native desktop resolution of %sx%s with an aspect ratio of %s is being used.",
                     temp1, temp2, getaspectratio(width, height));
 
                 free(temp1);
@@ -1494,10 +1494,21 @@ static void SetVideoMode(const bool createwindow, const bool output)
             }
         }
 #if defined(_WIN32)
+        else if (M_StringCompare(rendererinfo.name, "direct3d11"))
+        {
+            if (output)
+                C_Output("This scaling is done using hardware acceleration with " ITALICS("Direct3D v11.0."));
+
+            if (!M_StringCompare(vid_scaleapi, vid_scaleapi_direct3d))
+            {
+                vid_scaleapi = vid_scaleapi_direct3d;
+                M_SaveCVARs();
+            }
+        }
         else if (M_StringCompare(rendererinfo.name, vid_scaleapi_direct3d))
         {
             if (output)
-                C_Output("This scaling is done using hardware acceleration with " ITALICS("Direct3D."));
+                C_Output("This scaling is done using hardware acceleration with " ITALICS("Direct3D v9.0."));
 
             if (!M_StringCompare(vid_scaleapi, vid_scaleapi_direct3d))
             {

diff --git a/src/p_spec.h b/src/p_spec.h
@@ -817,7 +817,7 @@ enum
 };
 
 #if defined(X11) && defined(AnyKey)
-#  undef AnyKey
+#undef AnyKey
 #endif
 
 // define names for the locked door Kind field of the general ceiling