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

Remove entityclass::createentity() deltaframe kludge

Browse source 
This copy-pasted code only existed because the previous loop order was
incorrect and rendered entities before they would get properly updated
by the fixed render function. Now, the fixed render function is
guaranteed to be called before the render function, so we can rely on
that to update the drawframe and realcol of entities instead of
duplicating the code ourselves in createentity().

The drawframe assignment is still kept to fix the case where dying while
completestop is active (i.e. during a trinket or crewmate rescue
cutscene) and respawning in a different room won't turn everything into
Viridian sprites.
This commit is contained in:
Misa 2021-01-16 22:29:44 -08:00 committed by Ethan Lee
parent 2d9d0cffa5
commit cb5d181ce8
1 changed files with 0 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
desktop_version/src/Entity.cpp
View file

@ -2108,72 +2108,6 @@ void entityclass::createentity( float xp, float yp, int t, float vx /*= 0*/, flo
}
entity.drawframe = entity.tile;
if (!entity.invis)
{
entity.updatecolour();
}
if (entity.type == 1)
{
switch (entity.animate)
{
case 0: // Simple Loop
case 1: // Simple Loop
case 2: // Simpler Loop (just two frames)
case 5: // Simpler Loop (just two frames) (slower)
case 7: // Simpler Loop (just two frames) (slower) (with directions!)
case 11: // Conveyor right
entity.drawframe++;
break;
case 3: // Simpler Loop (just two frames, but double sized)
case 4: // Simpler Loop (just two frames, but double sized) (as above, but slower)
case 6: // Normal Loop (four frames, double sized)
entity.drawframe += 2;
break;
case 10: // Conveyor left
entity.drawframe += 3;
break;
default:
break;
}
}
else if (entity.type == 2 && entity.animate == 2)
{
entity.drawframe++;
}
// Make sure our crewmates are facing the player if applicable
// Also make sure they're flipped if they're flipped
// FIXME: Duplicated from updateentities!
if (entity.rule == 6 || entity.rule == 7)
{
if (entity.tile == 144 || entity.tile == 144+6)
{
entity.drawframe = 144;
}
if (entity.state == 18)
{
// Face the player
// FIXME: Duplicated from updateentities!
int j = getplayer();
if (INBOUNDS_VEC(j, entities) && entities[j].xp > entity.xp + 5)
{
entity.dir = 1;
}
else if (INBOUNDS_VEC(j, entities) && entities[j].xp < entity.xp - 5)
{
entity.dir = 0;
}
}
// Fix drawframe
// FIXME: Duplicated from animateentities!
if (entity.rule == 7)
{
entity.drawframe += 6;
}
if (entity.dir == 0)
{
entity.drawframe += 3;
}
}
if (!reuse)
{
@ -3029,7 +2963,6 @@ bool entityclass::updateentities( int i )
else if (entities[i].state == 18)
{
//Stand still and face the player
//FIXME: Duplicated in createentity!
int j = getplayer();
if (INBOUNDS_VEC(j, entities) && entities[j].xp > entities[i].xp + 5)
{
@ -3678,7 +3611,6 @@ void entityclass::animateentities( int _i )
case 12:
case 55:
case 14: //Crew member! Very similar to hero
//FIXME: Duplicated in createentity!
entities[_i].framedelay--;
if(entities[_i].dir==1)
{