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

Invert logic for readability

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-09-22 11:53:59 +02:00
parent dc6895ffdc
commit 18551ced5f
1 changed files with 60 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
src/fix.cxx
View File

@ -628,78 +628,77 @@ CDecor::ArrangeObject (Point cel)
} }
} }
// Arrange les rayons entre les tours.
if ( if (
!g_restoreBugs || g_restoreBugs &&
(g_restoreBugs && (m_decor[cel.x / 2][cel.y / 2].objectIcon != 27 && // not a tower?
(m_decor[cel.x / 2][cel.y / 2].objectIcon == 27 || // tour ? m_decor[cel.x / 2][cel.y / 2].objectIcon != -1))
m_decor[cel.x / 2][cel.y / 2].objectIcon == -1))) return;
// Arrange les rayons entre les tours.
for (i = 0; i < 4; i++)
{ {
for (i = 0; i < 4; i++) vector = GetVector (i * 2 * 16);
test = cel;
bTour = false;
j = 0;
while (true)
{ {
vector = GetVector (i * 2 * 16); test.x += vector.x * 2;
test = cel; test.y += vector.y * 2;
if (m_decor[test.x / 2][test.y / 2].objectIcon == 27) // tour ?
{
bTour = true;
break;
}
if (
m_decor[test.x / 2][test.y / 2].objectIcon != -1 &&
m_decor[test.x / 2][test.y / 2].objectIcon != 10001 - i % 2)
break;
j++;
if (j >= 2 + 1)
break;
}
if (m_decor[cel.x / 2][cel.y / 2].objectIcon != 27) // pas tour ?
bTour = false; bTour = false;
j = 0;
while (true)
{
test.x += vector.x * 2;
test.y += vector.y * 2;
if (m_decor[test.x / 2][test.y / 2].objectIcon == 27) // tour ? test = cel;
for (k = 0; k < j; k++)
{
test.x += vector.x * 2;
test.y += vector.y * 2;
if (bTour)
{
channel = CHOBJECT;
icon = 10001 - i % 2; // rayon e-o (10001) ou n-s (10000)
}
else
{
channel = -1;
icon = -1;
}
m_decor[test.x / 2][test.y / 2].objectChannel = channel;
m_decor[test.x / 2][test.y / 2].objectIcon = icon;
if (!m_bBuild && bTour)
{
if (MoveCreate (
test, -1, false, CHOBJECT, -1, -1, -1, 9999, 1, 0, true))
{ {
bTour = true; MoveAddIcons (test, 5 - i % 2, true); // éclairs
break;
} }
if ( pos = ConvCelToPos (test);
m_decor[test.x / 2][test.y / 2].objectIcon != -1 && m_pSound->PlayImage (SOUND_RAYON1, pos);
m_decor[test.x / 2][test.y / 2].objectIcon != 10001 - i % 2)
break;
j++;
if (j >= 2 + 1)
break;
} }
if (m_decor[cel.x / 2][cel.y / 2].objectIcon != 27) // pas tour ? if (!m_bBuild && !bTour)
bTour = false; MoveFinish (test);
test = cel;
for (k = 0; k < j; k++)
{
test.x += vector.x * 2;
test.y += vector.y * 2;
if (bTour)
{
channel = CHOBJECT;
icon = 10001 - i % 2; // rayon e-o (10001) ou n-s (10000)
}
else
{
channel = -1;
icon = -1;
}
m_decor[test.x / 2][test.y / 2].objectChannel = channel;
m_decor[test.x / 2][test.y / 2].objectIcon = icon;
if (!m_bBuild && bTour)
{
if (MoveCreate (
test, -1, false, CHOBJECT, -1, -1, -1, 9999, 1, 0, true))
{
MoveAddIcons (test, 5 - i % 2, true); // éclairs
}
pos = ConvCelToPos (test);
m_pSound->PlayImage (SOUND_RAYON1, pos);
}
if (!m_bBuild && !bTour)
MoveFinish (test);
}
} }
} }
} }