dahjah/hostile-takeover
1
0
Fork 0
mirror of https://github.com/spiffcode/hostile-takeover.git synced 2026-04-01 18:45:59 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change HtBitmap references to TBitmap

Browse Source
This commit is contained in:
Nathan Fulton 2017-04-30 22:19:50 -04:00
parent 7fa189e3da
commit 0cd8cff9c2
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
game/form.cpp
View File

@ -751,13 +751,13 @@ void FillHelper(DibBitmap *pbm, UpdateMap *pupd, Rect *prc, Color clr)
}
}
void BltHelper(DibBitmap *pbm, HtBitmap *phtbm, UpdateMap *pupd, int xDst, int yDst)
void BltHelper(DibBitmap *pbm, TBitmap *ptbm, UpdateMap *pupd, int xDst, int yDst)
{
if (pupd == NULL) {
phtbm->BltTo(pbm, xDst, yDst);
ptbm->BltTo(pbm, xDst, yDst);
} else {
Size siz;
phtbm->GetSize(&siz);
ptbm->GetSize(&siz);
Rect rc;
rc.Set(xDst, yDst, xDst + siz.cx, yDst + siz.cy);
Rect rcInvalid;
@ -769,7 +769,7 @@ void BltHelper(DibBitmap *pbm, HtBitmap *phtbm, UpdateMap *pupd, int xDst, int y
rcSrc.top = rcInvalid.top - yDst;
rcSrc.right = rcSrc.left + rcInvalid.Width();
rcSrc.bottom = rcSrc.top + rcInvalid.Height();
phtbm->BltTo(pbm, rcInvalid.left, rcInvalid.top, &rcSrc);
ptbm->BltTo(pbm, rcInvalid.left, rcInvalid.top, &rcSrc);
}
}
}

6
game/ht.h
View File

@ -3361,10 +3361,10 @@ public:
virtual bool Init(Form *pfrm, IniReader *pini, FindProp *pfind) secBitmapControl;
virtual void OnPaint(DibBitmap *pbm) secBitmapControl;
void SetBitmap(HtBitmap *phtbm) secBitmapControl;
void SetBitmap(TBitmap *ptbm) secBitmapControl;
private:
HtBitmap *m_phtbm;
TBitmap *m_ptbm;
};
// Slider Control
@ -8596,7 +8596,7 @@ void DrawTileMap(byte **ppbMap, int ctx, int cty, byte *pbDst, int cbDstStride,
FormMgr *CreateFormMgr(DibBitmap *pbm) secFormMgr;
void ShadowHelper(DibBitmap *pbm, UpdateMap *pupd, Rect *prc) secForm;
void FillHelper(DibBitmap *pbm, UpdateMap *pupd, Rect *prc, Color clr) secForm;
void BltHelper(DibBitmap *pbm, HtBitmap *phtbm, UpdateMap *pupd, int xDst, int yDst) secForm;
void BltHelper(DibBitmap *pbm, TBitmap *ptbm, UpdateMap *pupd, int xDst, int yDst) secForm;
void RgbToHsl(byte bR, byte bG, byte bB, word *pnH, word *pnS, word *pnL) secMisc;
void HslToRgb(word nH, word nS, word nL, byte *pbR, byte *pbG, byte *pbB) secMisc;
void SetHslAdjustedPalette(Palette *ppal, short nHueOffset, short nSatMultiplier, short nLumOffset) secMisc;

22
game/misccontrols.cpp
View File

@ -713,12 +713,12 @@ int FancyTextCore(DibBitmap *pbm, Font *pfntDefault, char *psz, int x, int y, in
BitmapControl::BitmapControl()
{
m_phtbm = NULL;
m_ptbm = NULL;
}
BitmapControl::~BitmapControl()
{
delete m_phtbm;
delete m_ptbm;
}
bool BitmapControl::Init(Form *pfrm, IniReader *pini, FindProp *pfind)
@ -746,7 +746,7 @@ bool BitmapControl::Init(Form *pfrm, IniReader *pini, FindProp *pfind)
return false;
Size siz = { 0, 0 };
m_phtbm->GetSize(&siz);
m_ptbm->GetSize(&siz);
m_rc.right = m_rc.left + siz.cx;
m_rc.bottom = m_rc.top + siz.cy;
return true;
@ -759,24 +759,24 @@ void BitmapControl::OnPaint(DibBitmap *pbm)
// Draw image
if (m_phtbm != NULL)
if (m_ptbm != NULL)
// HACK: this "& ~1" is to force word alignment on CE as required by RawBitmap::BltTo
// Character portrats have some side color in them that must be mapped to blue
m_phtbm->BltTo(pbm, (m_rc.left + rcForm.left) & ~1, m_rc.top + rcForm.top, kside1);
m_ptbm->BltTo(pbm, (m_rc.left + rcForm.left) & ~1, m_rc.top + rcForm.top, kside1);
}
void BitmapControl::SetBitmap(HtBitmap *phtbm)
void BitmapControl::SetBitmap(TBitmap *ptbm)
{
if (m_phtbm != NULL)
delete m_phtbm;
if (m_ptbm != NULL)
delete m_ptbm;
m_phtbm = phtbm;
m_ptbm = ptbm;
if (m_phtbm != NULL) {
if (m_ptbm != NULL) {
Size siz;
m_phtbm->GetSize(&siz);
m_ptbm->GetSize(&siz);
if (m_rc.Width() < siz.cx)
m_rc.right = m_rc.left + siz.cx;
if (m_rc.Height() < siz.cy)