diff --git a/Source/engine.h b/Source/engine.h index 4fffdc848..5181c1cbf 100644 --- a/Source/engine.h +++ b/Source/engine.h @@ -189,10 +189,6 @@ inline void CelBlitSafe(int sx, int sy, BYTE *pRLEBytes, int nDataSize, int nWid * @param nWidth Width of sprite */ void CelClippedDrawSafeTo(CelOutputBuffer out, int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth); -inline void CelClippedDrawSafe(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth) -{ - return CelClippedDrawSafeTo(GlobalBackBuffer(), sx, sy, pCelBuff, nCel, nWidth); -} /** * @brief Blit CEL sprite, and apply lighting, to the given buffer, checks for drawing outside the buffer diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp index 492ebc29a..0b4ff985f 100644 --- a/Source/scrollrt.cpp +++ b/Source/scrollrt.cpp @@ -213,20 +213,20 @@ static void scrollrt_draw_cursor_item(CelOutputBuffer out) if (pcurs <= 179) { CelBlitOutlineTo(out, col, mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW); if (col != PAL16_RED + 5) { - CelClippedDrawSafe(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW); + CelClippedDrawSafeTo(out, mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW); } else { CelDrawLightRedSafe(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW, 1); } } else { CelBlitOutlineTo(out, col, mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels2, pcurs - 179, cursW); if (col != PAL16_RED + 5) { - CelClippedDrawSafe(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels2, pcurs - 179, cursW); + CelClippedDrawSafeTo(out, mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels2, pcurs - 179, cursW); } else { CelDrawLightRedSafe(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels2, pcurs - 179, cursW, 0); } } } else { - CelClippedDrawSafe(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW); + CelClippedDrawSafeTo(out, mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW); } }