Merge branch 'master' of https://github.com/chocolate-doom/chocolate-…

…doom
fabiangreffrath · Jan 3, 2024 · 383984c · 383984c
2 parents e80707e + 22510a8
commit 383984c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/man/INSTALL.template b/man/INSTALL.template
@@ -236,8 +236,8 @@ are needed:
  * The IWAD file “chex.wad”, from the Chex Quest CD.
 
  * The dehacked patch “chex.deh”, which can be found here:
-   https://www.doomworld.com/idgames/utils/exe_edit/patches/chexdeh
-   (utils/exe_edit/patches/chexdeh.zip in your nearest /idgames mirror)
+   https://www.doomworld.com/idgames/themes/chex/chexdeh
+   (themes/chex/chexdeh.zip in your nearest /idgames mirror)
 
 Copy these files into a directory together and use the `-iwad` command
 line parameter to specify the Chex Quest IWAD file:

diff --git a/src/doom/d_main.c b/src/doom/d_main.c
@@ -1372,7 +1372,7 @@ static void LoadIwadDeh(void)
                     "The dehacked file is required in order to emulate\n"
                     "chex.exe correctly.  It can be found in your nearest\n"
                     "/idgames repository mirror at:\n\n"
-                    "   utils/exe_edit/patches/chexdeh.zip");
+                    "   themes/chex/chexdeh.zip");
         }
 
         if (!DEH_LoadFile(chex_deh))

diff --git a/src/i_video.c b/src/i_video.c
@@ -1116,10 +1116,20 @@ void I_InitWindowIcon(void)
 
 static void SetScaleFactor(int factor)
 {
+    int height;
+
     // Pick 320x200 or 320x240, depending on aspect ratio correct
+    if (aspect_ratio_correct)
+    {
+        height = SCREENHEIGHT_4_3;
+    }
+    else
+    {
+        height = SCREENHEIGHT;
+    }
 
     window_width = factor * SCREENWIDTH;
-    window_height = factor * actualheight;
+    window_height = factor * height;
     fullscreen = false;
 }