stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-02-24 21:01:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-postprocessing' into 'v1'

Browse source 
Fix Post Processing in 64-bit Software 3P/4P

See merge request KartKrew/Kart!156
This commit is contained in:
wolfs 2019-05-28 06:35:33 -04:00
commit a562673d3f
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/v_video.c
View file

@ -292,7 +292,7 @@ void VID_BlitLinearScreen(const UINT8 *srcptr, UINT8 *destptr, INT32 width, INT3
#ifdef HAVE_VIDCOPY #ifdef HAVE_VIDCOPY
VID_BlitLinearScreen_ASM(srcptr,destptr,width,height,srcrowbytes,destrowbytes); VID_BlitLinearScreen_ASM(srcptr,destptr,width,height,srcrowbytes,destrowbytes);
#else #else
if (srcrowbytes == destrowbytes) if ((srcrowbytes == destrowbytes) && (srcrowbytes == (size_t)width))
M_Memcpy(destptr, srcptr, srcrowbytes * height); M_Memcpy(destptr, srcptr, srcrowbytes * height);
else else
{ {
@ -2404,7 +2404,7 @@ INT32 V_ThinStringWidth(const char *string, INT32 option)
boolean *heatshifter = NULL; boolean *heatshifter = NULL;
INT32 lastheight = 0; INT32 lastheight = 0;
INT32 heatindex[2] = { 0, 0 }; INT32 heatindex[MAXSPLITSCREENPLAYERS] = {0, 0, 0, 0};
// //
// V_DoPostProcessor // V_DoPostProcessor
@ -2537,9 +2537,6 @@ Unoptimized version
UINT8 *srcscr = screens[0]; UINT8 *srcscr = screens[0];
INT32 y; INT32 y;
if (splitscreen > 1) // 3P/4P has trouble supporting this, anyone want to fix it? :p
return;
// Make sure table is built // Make sure table is built
if (heatshifter == NULL || lastheight != viewheight) if (heatshifter == NULL || lastheight != viewheight)
{ {
@ -2554,7 +2551,7 @@ Unoptimized version
heatshifter[y] = true; heatshifter[y] = true;
} }
heatindex[0] = heatindex[1] = 0; heatindex[0] = heatindex[1] = heatindex[2] = heatindex[3] = 0;
lastheight = viewheight; lastheight = viewheight;
} }