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

Make tiles in tower mode behave consistently with tower tileset elsewhere

Browse source 
Previously, in tower mode, being inside walls would just kill you, unlike
being inside walls outside tower mode, which was somewhat confusing.

Also, spikes behaved differently with regards to invincibility, being
unsolid in towers but solid outside them.

This does not change the behaviour of the "edge" spikes in towers.
This commit is contained in:
Fredrik Ljungdahl 2020-02-05 22:02:00 +01:00
parent b32c91a6e9
commit 1062113f73
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop_version/src/Entity.cpp
View file

@ -37,12 +37,6 @@ bool entityclass::checktowerspikes(int t, mapclass& map)
} }
} }
} }
if (temprect.w >= 12)
{
tpx1 = getgridpoint(temprect.x + 6);
if (map.collide(tpx1, tempy)) return true;
if (map.collide(tpx1, temph)) return true;
}
return false; return false;
} }

4
desktop_version/src/Map.cpp
View file

@ -699,6 +699,10 @@ bool mapclass::collide(int x, int y)
if (towermode) if (towermode)
{ {
if (tower.at(x, y, 0) >= 12 && tower.at(x, y, 0) <= 27) return true; if (tower.at(x, y, 0) >= 12 && tower.at(x, y, 0) <= 27) return true;
if (invincibility)
{
if (tower.at(x, y, 0) >= 6 && tower.at(x, y, 0) <= 11) return true;
}
} }
else if (tileset == 2) else if (tileset == 2)
{ {