backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Remove obsolete mask argument of many draw functions

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-10-18 07:04:35 +02:00
parent 9d23c1012c
commit a64b03c1da
7 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/button.cxx
View File

@ -155,7 +155,7 @@ CButton::Draw ()
rect.right = m_pos.x + m_dim.x; rect.right = m_pos.x + m_dim.x;
rect.top = m_pos.y; rect.top = m_pos.y;
rect.bottom = m_pos.y + m_dim.y; rect.bottom = m_pos.y + m_dim.y;
m_pPixmap->DrawPart (-1, CHBACK, m_pos, rect, 1); // dessine le fond m_pPixmap->DrawPart (-1, CHBACK, m_pos, rect); // dessine le fond
return; return;
} }

2
src/decor.cxx
View File

@ -684,7 +684,7 @@ CDecor::BuildMoveFloor (Sint32 x, Sint32 y, Point pos, Sint32 rank)
m_move[rank].maskChannel, icon, m_move[rank].channel, m_move[rank].icon, m_move[rank].maskChannel, icon, m_move[rank].channel, m_move[rank].icon,
0); 0);
m_pPixmap->DrawIcon (-1, m_move[rank].channel, 0, pos, true); m_pPixmap->DrawIcon (-1, m_move[rank].channel, 0, pos);
} }
else else
{ {

4
src/decstat.cxx
View File

@ -693,7 +693,7 @@ CDecor::StatisticDraw ()
rect.top = pos.y; rect.top = pos.y;
rect.bottom = pos.y + DIMSTATY; rect.bottom = pos.y + DIMSTATY;
m_pPixmap->DrawPart (-1, CHBACK, pos, rect, 1); // dessine le fond m_pPixmap->DrawPart (-1, CHBACK, pos, rect); // dessine le fond
if (rank == 0 && m_bStatUp) if (rank == 0 && m_bStatUp)
{ {
@ -768,7 +768,7 @@ CDecor::StatisticDraw ()
rect.right = pos.x + POSDRAWX; rect.right = pos.x + POSDRAWX;
rect.top = pos.y; rect.top = pos.y;
rect.bottom = pos.y + 16; rect.bottom = pos.y + 16;
m_pPixmap->DrawPart (-1, CHBACK, pos, rect, 1); // dessine le fond m_pPixmap->DrawPart (-1, CHBACK, pos, rect); // dessine le fond
if (strlen (textRes)) if (strlen (textRes))
{ {

6
src/event.cxx
View File

@ -2148,7 +2148,7 @@ CEvent::DrawButtons ()
rect.right = pos.x + 20; rect.right = pos.x + 20;
rect.top = pos.y; rect.top = pos.y;
rect.bottom = pos.y + 15; rect.bottom = pos.y + 15;
m_pPixmap->DrawPart (-1, CHBACK, pos, rect, 1); // dessine le fond m_pPixmap->DrawPart (-1, CHBACK, pos, rect); // dessine le fond
if (m_speed > 1) if (m_speed > 1)
{ {
snprintf (res, sizeof (res), "x%d", m_speed); snprintf (res, sizeof (res), "x%d", m_speed);
@ -2166,7 +2166,7 @@ CEvent::DrawButtons ()
rect.right = POSDRAWX + DIMDRAWX; rect.right = POSDRAWX + DIMDRAWX;
rect.top = 0; rect.top = 0;
rect.bottom = lg; rect.bottom = lg;
m_pPixmap->DrawPart (-1, CHBACK, pos, rect, 1); m_pPixmap->DrawPart (-1, CHBACK, pos, rect);
pos.x = POSDRAWX; pos.x = POSDRAWX;
pos.y = lg; pos.y = lg;
@ -2174,7 +2174,7 @@ CEvent::DrawButtons ()
rect.right = POSDRAWX + DIMDRAWX; rect.right = POSDRAWX + DIMDRAWX;
rect.top = 0; rect.top = 0;
rect.bottom = POSDRAWY; rect.bottom = POSDRAWY;
m_pPixmap->DrawPart (-1, CHBACK, pos, rect, 1); m_pPixmap->DrawPart (-1, CHBACK, pos, rect);
pos.x = POSDRAWX + 20; pos.x = POSDRAWX + 20;
pos.y = POSDRAWY + 4; pos.y = POSDRAWY + 4;

11
src/pixmap.cxx
View File

@ -373,8 +373,7 @@ CPixmap::IsIconPixel (size_t channel, Sint32 rank, Point pos)
// Les modes sont 0=transparent, 1=opaque. // Les modes sont 0=transparent, 1=opaque.
bool bool
CPixmap::DrawIcon ( CPixmap::DrawIcon (Sint32 chDst, size_t channel, Sint32 rank, Point pos)
Sint32 chDst, size_t channel, Sint32 rank, Point pos, bool bMask)
{ {
Sint32 nbx, nby; Sint32 nbx, nby;
Rect rect; Rect rect;
@ -411,8 +410,7 @@ CPixmap::DrawIcon (
// 33,48 35,49 // 33,48 35,49
bool bool
CPixmap::DrawIconDemi ( CPixmap::DrawIconDemi (Sint32 chDst, size_t channel, Sint32 rank, Point pos)
Sint32 chDst, size_t channel, Sint32 rank, Point pos, bool bMask)
{ {
Sint32 nbx, nby; Sint32 nbx, nby;
Rect rect; Rect rect;
@ -445,7 +443,7 @@ CPixmap::DrawIconDemi (
bool bool
CPixmap::DrawIconPart ( CPixmap::DrawIconPart (
Sint32 chDst, size_t channel, Sint32 rank, Point pos, Sint32 startY, Sint32 chDst, size_t channel, Sint32 rank, Point pos, Sint32 startY,
Sint32 endY, bool bMask) Sint32 endY)
{ {
Sint32 nbx, nby; Sint32 nbx, nby;
Rect rect; Rect rect;
@ -477,8 +475,7 @@ CPixmap::DrawIconPart (
// Dessine une partie d'image n'importe o�. // Dessine une partie d'image n'importe o�.
bool bool
CPixmap::DrawPart ( CPixmap::DrawPart (Sint32 chDst, size_t channel, Point dest, Rect rect)
Sint32 chDst, size_t channel, Point dest, Rect rect, bool bMask)
{ {
if (m_SDLTextureInfo.find (channel) == m_SDLTextureInfo.end ()) if (m_SDLTextureInfo.find (channel) == m_SDLTextureInfo.end ())
return false; return false;

11
src/pixmap.h
View File

@ -66,15 +66,12 @@ public:
bool IsIconPixel (size_t channel, Sint32 rank, Point pos); bool IsIconPixel (size_t channel, Sint32 rank, Point pos);
bool DrawIcon ( bool DrawIcon (Sint32 chDst, size_t channel, Sint32 rank, Point pos);
Sint32 chDst, size_t channel, Sint32 rank, Point pos, bool bMask = false); bool DrawIconDemi (Sint32 chDst, size_t channel, Sint32 rank, Point pos);
bool DrawIconDemi (
Sint32 chDst, size_t channel, Sint32 rank, Point pos, bool bMask = false);
bool DrawIconPart ( bool DrawIconPart (
Sint32 chDst, size_t channel, Sint32 rank, Point pos, Sint32 startY, Sint32 chDst, size_t channel, Sint32 rank, Point pos, Sint32 startY,
Sint32 endY, bool bMask = false); Sint32 endY);
bool DrawPart ( bool DrawPart (Sint32 chDst, size_t channel, Point dest, Rect rect);
Sint32 chDst, size_t channel, Point dest, Rect rect, bool bMask = false);
bool DrawImage (Sint32 chDst, size_t channel, Rect rect); bool DrawImage (Sint32 chDst, size_t channel, Rect rect);
bool BuildIconMask ( bool BuildIconMask (

2
src/progress.cxx
View File

@ -72,7 +72,7 @@ CJauge::Draw ()
rect.right = m_pos.x + m_dim.x; rect.right = m_pos.x + m_dim.x;
rect.top = m_pos.y; rect.top = m_pos.y;
rect.bottom = m_pos.y + m_dim.y; rect.bottom = m_pos.y + m_dim.y;
m_pPixmap->DrawPart (-1, CHBACK, m_pos, rect, 1); // dessine le fond m_pPixmap->DrawPart (-1, CHBACK, m_pos, rect); // dessine le fond
return; return;
} }