Better fix for automap marks

See fabiangreffrath/crispy-doom#1127
JNechaevsky · Dec 21, 2023 · 96a593b · 96a593b
1 parent d67b76e
commit 96a593b
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/src/doom/am_map.c b/src/doom/am_map.c
@@ -2393,6 +2393,7 @@ static void AM_drawSpectator (void)
 static void AM_drawMarks (void)
 {
     int i, fx, fy;
+    int fx_flip; // [crispy] support for marks drawing in flipped levels
     mpoint_t pt;
 
     // [JN] killough 2/22/98: remove automap mark limit
@@ -2411,15 +2412,9 @@ static void AM_drawMarks (void)
                 AM_rotatePoint(&pt);
             }
 
-            if (gp_flip_levels)
-            {
-                fx = (flipscreenwidth[CXMTOF(pt.x)] / vid_resolution) - 1;
-            }
-            else
-            {
-                fx = (CXMTOF(pt.x) / vid_resolution) - 1;
-            }
+            fx = (CXMTOF(pt.x) / vid_resolution) - 1;
             fy = (CYMTOF(pt.y) / vid_resolution) - 2;
+            fx_flip = (flipscreenwidth[CXMTOF(pt.x)] / vid_resolution) - 1;
 
             do
             {
@@ -2434,11 +2429,11 @@ static void AM_drawMarks (void)
                 if (fx >= f_x && fx <= (f_w / vid_resolution) - 5
                 &&  fy >= f_y && fy <= (f_h / vid_resolution) - 6)
                 {
-                    V_DrawPatch(fx - WIDESCREENDELTA, fy, marknums[d]);
+                    V_DrawPatch(fx_flip - WIDESCREENDELTA, fy, marknums[d]);
                 }
 
                 // killough 2/22/98: 1 space backwards
-                fx -= MARK_W - (MARK_FLIP_1);
+                fx_flip -= MARK_W - (MARK_FLIP_1);
 
                 j /= 10;
             } while (j > 0);