AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-20 18:37:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

add DivRoundClosest function, formatting (#1786)

Browse Source
This commit is contained in:
Roman Fomin 2024-07-13 09:07:49 +07:00 committed by GitHub
parent 80740b0b1f
commit c447781a13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/doomtype.h
View File

@ -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

4
src/f_finale.c
View File

@ -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)
{

2
src/v_video.c
View File

@ -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;