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

Merge pull request #149 from FredrIQ/master

Browse source 
Make tiles in tower mode consistent with tower tileset elsewhere
This commit is contained in:
Terry Cavanagh 2020-02-06 16:36:21 +01:00 committed by GitHub
commit 3d8c84bbbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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)
{ {