Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move crewmate drawframe fix to entity creation instead of loadlevel

Browse Source 
This makes it so the fix for crewmates' drawframes being wrong for
1-frame is fixed for all crewmates regardless of when they get created.
Sure, crewmates created in mapclass::loadlevel() have their drawframes
fixed there, but for crewmates that get created from scripting (such as
Violet when gotorooming to the Ship teleporter room after Space Station
1), this fix doesn't apply to them. But now it does, and Violet will no
longer be facing the wrong way for 1 frame when teleporting to the Ship
teleporter room in the Space Station 1 Level Complete cutscene.
This commit is contained in:
Misa
2020-09-07 16:27:44 -07:00
committed by Ethan Lee
parent f014ed6fe8
commit 610f4e7782
2 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
desktop_version/src/Map.cpp
View File

@@ -2084,37 +2084,6 @@ void mapclass::loadlevel(int rx, int ry)
}
}
}
//Make sure our crewmates are facing the player if appliciable
//Also make sure they're flipped if they're flipped
for (size_t i = 0; i < obj.entities.size(); i++)
{
if (obj.entities[i].rule == 6 || obj.entities[i].rule == 7)
{
if (obj.entities[i].tile == 144 || obj.entities[i].tile == 144+6)
{
obj.entities[i].drawframe = 144;
}
if (obj.entities[i].state == 18)
{
//face the player
int j = obj.getplayer();
if (j > -1 && obj.entities[j].xp > obj.entities[i].xp + 5)
{
obj.entities[i].dir = 1;
}
else if (j > -1 && obj.entities[j].xp < obj.entities[i].xp - 5)
{
obj.entities[i].dir = 0;
obj.entities[i].drawframe += 3;
}
}
}
if (obj.entities[i].rule == 7)
{
obj.entities[i].drawframe += 6;
}
}
}
void mapclass::twoframedelayfix()