mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

Remove remnants of entity 'active' conditionals

Browse source 
In the previous commit, if an if-statement consisted solely of checking
the active attribute of an entity, I temporarily changed it to 'true'
and put a comment to remove it later, because it would add too much
noise to unindent everything in the same commit.
This commit is contained in:
Misa 2020-04-03 13:57:02 -07:00 committed by Ethan Lee
parent b1b1474b7b
commit fd417d6a8c
2 changed files with 1595 additions and 1615 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3181
desktop_version/src/Entity.cpp
View file

File diff suppressed because it is too large Load diff

29
desktop_version/src/Map.cpp
View file

@ -1826,24 +1826,21 @@ void mapclass::loadlevel(int rx, int ry)
for (size_t i = 0; i < obj.entities.size(); i++)
{
if (true) //FIXME: remove this later (no more 'active')
if (obj.entities[i].type == 1 && obj.entities[i].behave >= 8 && obj.entities[i].behave < 10)
{
if (obj.entities[i].type == 1 && obj.entities[i].behave >= 8 && obj.entities[i].behave < 10)
//put a block underneath
temp = obj.entities[i].xp / 8.0f;
temp2 = obj.entities[i].yp / 8.0f;
settile(temp, temp2, 1);
settile(temp+1, temp2, 1);
settile(temp+2, temp2, 1);
settile(temp+3, temp2, 1);
if (obj.entities[i].w == 64)
{
//put a block underneath
temp = obj.entities[i].xp / 8.0f;
temp2 = obj.entities[i].yp / 8.0f;
settile(temp, temp2, 1);
settile(temp+1, temp2, 1);
settile(temp+2, temp2, 1);
settile(temp+3, temp2, 1);
if (obj.entities[i].w == 64)
{
settile(temp+4, temp2, 1);
settile(temp+5, temp2, 1);
settile(temp+6, temp2, 1);
settile(temp+7, temp2, 1);
}
settile(temp+4, temp2, 1);
settile(temp+5, temp2, 1);
settile(temp+6, temp2, 1);
settile(temp+7, temp2, 1);
}
}
}