add DivRoundClosest function, formatting (#1786)

fabiangreffrath · Jul 13, 2024 · c447781 · c447781
1 parent 80740b0
commit c447781
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/src/doomtype.h b/src/doomtype.h
@@ -73,15 +73,16 @@ typedef byte lighttable_t;
 
 #define arrlen(array) (sizeof(array) / sizeof(*array))
 
-#ifndef MIN
- #define MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-#ifndef MAX
- #define MAX(a,b) (((a)>(b))?(a):(b))
-#endif
-#ifndef BETWEEN
- #define BETWEEN(l,u,x) ((l)>(x)?(l):(x)>(u)?(u):(x))
-#endif
+#define MIN(a, b) (((a) < (b)) ? (a) : (b))
+
+#define MAX(a, b) (((a) > (b)) ? (a) : (b))
+
+#define BETWEEN(l, u, x) ((l) > (x) ? (l) : (x) > (u) ? (u) : (x))
+
+inline static int DivRoundClosest(const int n, const int d)
+{
+    return ((n < 0) == (d < 0)) ? ((n + d / 2) / d) : ((n - d / 2) / d);
+}
 
 #if defined(_MSC_VER) && !defined(__cplusplus)
 #define inline __inline

diff --git a/src/f_finale.c b/src/f_finale.c
@@ -696,13 +696,13 @@ void F_BunnyScroll (void)
 
   scrolled = 320 - (finalecount-230)/2;
 
-  int p1offset = (video.unscaledw - SHORT(p1->width) + 1) / 2;
+  int p1offset = DivRoundClosest(video.unscaledw - SHORT(p1->width), 2);
   if (SHORT(p1->width) == 320)
   {
       p1offset += (SHORT(p2->width) - 320) / 2;
   }
 
-  int p2offset = (video.unscaledw - SHORT(p2->width) + 1) / 2;
+  int p2offset = DivRoundClosest(video.unscaledw - SHORT(p2->width), 2);
 
   if (scrolled <= 0)
   {

diff --git a/src/v_video.c b/src/v_video.c
@@ -519,7 +519,7 @@ void V_DrawPatchTRTR(int x, int y, patch_t *patch, byte *outr1, byte *outr2)
 
 void V_DrawPatchFullScreen(patch_t *patch)
 {
-    const int x = (video.unscaledw - SHORT(patch->width)) / 2;
+    const int x = DivRoundClosest(video.unscaledw - SHORT(patch->width), 2);
 
     patch->leftoffset = 0;
     patch->topoffset = 0;