blits need fixing

ja2-stracciatella · Nov 9, 2018 · 04a026f · 04a026f
1 parent 726765b
commit 04a026f
Show file tree

Hide file tree

Showing 3 changed files with 829 additions and 1,267 deletions.
diff --git a/src/game/TileEngine/RenderWorld.cc b/src/game/TileEngine/RenderWorld.cc
@@ -1236,7 +1236,7 @@ static void RenderTiles(RenderTilesFlags const uiFlags, INT32 const iStartPointX
 							{
 								if (fObscuredBlitter)
 								{
-									Blt8BPPDataTo16BPPBufferOutlineZPixelateObscured((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, outline_color);
+									Blt32BPPDataTo32BPPBufferOutlineZPixelateObscured(pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, outline_color);
 								}
 								else
 								{
@@ -1247,7 +1247,7 @@ static void RenderTiles(RenderTilesFlags const uiFlags, INT32 const iStartPointX
 							{
 								if (fObscuredBlitter)
 								{
-									Blt8BPPDataTo16BPPBufferOutlineZPixelateObscuredClip((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, outline_color, &gClippingRect);
+									Blt32BPPDataTo32BPPBufferOutlineZPixelateObscuredClip(pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, outline_color, &gClippingRect);
 								}
 								else
 								{
@@ -1340,7 +1340,7 @@ static void RenderTiles(RenderTilesFlags const uiFlags, INT32 const iStartPointX
 										{
 											if (fZWrite)
 											{
-												Blt8BPPDataTo16BPPBufferTransShadowZClip((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, &gClippingRect, pShadeTable);
+												Blt32BPPDataTo32BPPBufferTransShadowZClip(pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, &gClippingRect, pShadeTable);
 											}
 											else
 											{
@@ -1350,7 +1350,7 @@ static void RenderTiles(RenderTilesFlags const uiFlags, INT32 const iStartPointX
 												}
 												else
 												{
-													Blt8BPPDataTo16BPPBufferTransShadowZNBClip((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, &gClippingRect, pShadeTable);
+													Blt32BPPDataTo32BPPBufferTransShadowZNBClip(pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, &gClippingRect, pShadeTable);
 												}
 											}
 
@@ -1414,7 +1414,7 @@ static void RenderTiles(RenderTilesFlags const uiFlags, INT32 const iStartPointX
 										{
 											if (fObscuredBlitter)
 											{
-												Blt8BPPDataTo16BPPBufferTransZClipPixelateObscured((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, &gClippingRect);
+												Blt32BPPDataTo32BPPBufferTransZPixelateObscuredClip(pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, &gClippingRect);
 											}
 											else
 											{
@@ -1461,7 +1461,7 @@ static void RenderTiles(RenderTilesFlags const uiFlags, INT32 const iStartPointX
 										{
 											if (fZWrite)
 											{
-												Blt8BPPDataTo16BPPBufferTransShadowZ((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, pShadeTable);
+												Blt32BPPDataTo32BPPBufferTransShadowZ(pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, pShadeTable);
 											}
 											else
 											{
@@ -1471,7 +1471,7 @@ static void RenderTiles(RenderTilesFlags const uiFlags, INT32 const iStartPointX
 												}
 												else
 												{
-													Blt8BPPDataTo16BPPBufferTransShadowZNB((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, pShadeTable);
+													Blt32BPPDataTo32BPPBufferTransShadowZNB(pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, pShadeTable);
 												}
 											}
 
@@ -1533,7 +1533,7 @@ static void RenderTiles(RenderTilesFlags const uiFlags, INT32 const iStartPointX
 										{
 											if (fObscuredBlitter)
 											{
-												Blt8BPPDataTo16BPPBufferTransZPixelateObscured((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex);
+												Blt32BPPDataTo32BPPBufferTransZPixelateObscured(pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex);
 											}
 											else
 											{