mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Migrate `CelDrawLightRedSafe` to `CelDrawLightRedSafeTo`

pull/1116/head
Gleb Mazovetskiy 5 years ago committed by Anders Jenbo
parent
a70de3cecd
commit
eadc5a20a3
2 changed files with 2 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      Source/engine.h
  2. 4
      Source/scrollrt.cpp

16
Source/engine.h
Unescape View File

@ -174,10 +174,6 @@ void CelDrawLightRedTo(CelOutputBuffer out, int sx, int sy, BYTE *pCelBuff, int
* @param nWidth Width of sprite
*/
void CelBlitSafeTo(CelOutputBuffer out, int sx, int sy, BYTE *pRLEBytes, int nDataSize, int nWidth);
inline void CelBlitSafe(int sx, int sy, BYTE *pRLEBytes, int nDataSize, int nWidth)
{
return CelBlitSafeTo(GlobalBackBuffer(), sx, sy, pRLEBytes, nDataSize, nWidth);
}
/**
* @brief Same as CelClippedDrawTo but checks for drawing outside the buffer
@ -201,10 +197,6 @@ void CelClippedDrawSafeTo(CelOutputBuffer out, int sx, int sy, BYTE *pCelBuff, i
* @param tbl Palette translation table
*/
void CelBlitLightSafeTo(CelOutputBuffer out, int sx, int sy, BYTE *pRLEBytes, int nDataSize, int nWidth, BYTE *tbl);
inline void CelBlitLightSafe(int sx, int sy, BYTE *pRLEBytes, int nDataSize, int nWidth, BYTE *tbl)
{
return CelBlitLightSafeTo(GlobalBackBuffer(), sx, sy, pRLEBytes, nDataSize, nWidth, tbl);
}
/**
* @brief Same as CelBlitLightSafeTo but with stippled transparancy applied
@ -216,10 +208,6 @@ inline void CelBlitLightSafe(int sx, int sy, BYTE *pRLEBytes, int nDataSize, int
* @param nWidth Width of sprite
*/
void CelBlitLightTransSafeTo(CelOutputBuffer out, int sx, int sy, BYTE *pRLEBytes, int nDataSize, int nWidth);
inline void CelBlitLightTransSafe(int sx, int sy, BYTE *pRLEBytes, int nDataSize, int nWidth)
{
return CelBlitLightTransSafeTo(GlobalBackBuffer(), sx, sy, pRLEBytes, nDataSize, nWidth);
}
/**
* @brief Same as CelDrawLightRedTo but checks for drawing outside the buffer
@ -232,10 +220,6 @@ inline void CelBlitLightTransSafe(int sx, int sy, BYTE *pRLEBytes, int nDataSize
* @param light Light shade to use
*/
void CelDrawLightRedSafeTo(CelOutputBuffer out, int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, char light);
inline void CelDrawLightRedSafe(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, char light)
{
return CelDrawLightRedSafeTo(GlobalBackBuffer(), sx, sy, pCelBuff, nCel, nWidth, light);
}
/**
* @brief Blit a solid colder shape one pixel larger then the given sprite shape, to the target buffer at the given coordianates

4
Source/scrollrt.cpp
Unescape View File

@ -215,14 +215,14 @@ static void scrollrt_draw_cursor_item(CelOutputBuffer out)
if (col != PAL16_RED + 5) {
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);
CelDrawLightRedSafeTo(out, 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) {
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);
CelDrawLightRedSafeTo(out, mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels2, pcurs - 179, cursW, 0);
}
}
} else {

Write Preview
Loading…
Cancel
Save