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

Fix bounding logic for enemies

Browse source 
When I refactored custom level entity creation logic earlier, I forgot
to account for enemy bounds, so enemies would take on the same bounds as
platforms. But this is fixed now.
This commit is contained in:
Misa 2020-08-02 20:47:42 -07:00 committed by Ethan Lee
parent 70ad0003e1
commit 95d4465e3e
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
desktop_version/src/Map.cpp
View file

@ -1723,12 +1723,24 @@ void mapclass::loadlevel(int rx, int ry)
// Platform and enemy bounding boxes
int bx1 = 0, by1 = 0, bx2 = 0, by2 = 0;
if (ent.t == 1 || (ent.t == 2 && ent.p1 <= 4))
bool enemy = ent.t == 1;
bool moving_plat = ent.t == 2 && ent.p1 <= 4;
if (enemy || moving_plat)
{
if (enemy)
{
bx1 = room.enemyx1;
by1 = room.enemyy1;
bx2 = room.enemyx2;
by2 = room.enemyy2;
}
else if (moving_plat)
{
bx1 = room.platx1;
by1 = room.platy1;
bx2 = room.platx2;
by2 = room.platy2;
}
// Enlarge bounding boxes to fix warping entities
if (warpx && bx1 == 0 && bx2 == 320)