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

Use a method for fixing the decor shifting

Browse Source 
It will be used for supporting the smooth scrolling.
This commit is contained in:
Mathieu Schroeter 2017-10-30 17:37:59 +01:00
parent 6e7947b7be
commit 481f4db4b4
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/decor.cxx
View File

@ -449,6 +449,29 @@ CDecor::SetFire (Point cel, bool bFire)
return true;
}
void
CDecor::FixShifting (Sint32 & nbx, Sint32 & nby, Point & iCel, Point & iPos)
{
if (m_shiftOffset.x < 0) // décalage à droite ?
nbx += 2;
if (m_shiftOffset.y < 0) // décalage en bas ?
nby += 2;
if (m_shiftOffset.x > 0) // décalage à gauche ?
{
nbx += 2;
iCel.x--;
iCel.y++;
iPos = ConvCelToPos (iCel);
}
if (m_shiftOffset.y > 0) // décalage en haut ?
{
nby += 2;
iCel.x--;
iCel.y--;
iPos = ConvCelToPos (iCel);
}
}
// Modifie l'offset pour le shift.
void
@ -1435,24 +1458,7 @@ CDecor::Build (Rect clip, Point posMouse)
if (!m_bFog)
goto term;
if (m_shiftOffset.x < 0) // décalage à droite ?
nbx += 2;
if (m_shiftOffset.y < 0) // décalage en bas ?
nby += 2;
if (m_shiftOffset.x > 0) // décalage à gauche ?
{
nbx += 2;
iCel.x--;
iCel.y++;
iPos = ConvCelToPos (iCel);
}
if (m_shiftOffset.y > 0) // décalage en haut ?
{
nby += 2;
iCel.x--;
iCel.y--;
iPos = ConvCelToPos (iCel);
}
this->FixShifting (nbx, nby, iCel, iPos);
mCel = iCel;
mPos = iPos;

1
src/decor.h
View File

@ -381,6 +381,7 @@ public:
bool IsCheminFree (Sint32 rank, Point dest, Sint32 button);
// Decor.cpp
void FixShifting (Sint32 & nbx, Sint32 & nby, Point & iCel, Point & iPos);
void SetShiftOffset (Point offset);
Point ConvCelToPos (Point cel);
Point ConvPosToCel (Point pos, bool bMap = false);