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

Split onground/onroof into visual and logical variables

Browse source 
I will need to separate these into two different variables because I
will need to move logical onground/onroof assignments to the start of
gamelogic() - if I kept them together, however, that would change the
visuals of onground/onroof, which I want to keep consistent with 2.2.
This commit is contained in:
Misa 2021-03-18 13:18:33 -07:00 committed by Ethan Lee
parent d5d9d9ba96
commit 63a60b11cc
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop_version/src/Ent.cpp
View file

@ -46,6 +46,8 @@ void entclass::clear(void)
gravity = false; gravity = false;
onground = 0; onground = 0;
onroof = 0; onroof = 0;
visualonground = 0;
visualonroof = 0;
onentity = 0; onentity = 0;
harmful = false; harmful = false;

1
desktop_version/src/Ent.h
View file

@ -49,6 +49,7 @@ public:
int onground, onroof; int onground, onroof;
//Animation //Animation
int framedelay, drawframe, walkingframe, dir, actionframe; int framedelay, drawframe, walkingframe, dir, actionframe;
int visualonground, visualonroof;
int yp;int xp; int yp;int xp;
Uint32 realcol; Uint32 realcol;

12
desktop_version/src/Entity.cpp
View file

@ -3379,7 +3379,7 @@ void entityclass::animateentities( int _i )
entities[_i].drawframe=entities[_i].tile+3; entities[_i].drawframe=entities[_i].tile+3;
} }
if(entities[_i].onground>0 || entities[_i].onroof>0) if(entities[_i].visualonground>0 || entities[_i].visualonroof>0)
{ {
if(entities[_i].vx > 0.00f || entities[_i].vx < -0.00f) if(entities[_i].vx > 0.00f || entities[_i].vx < -0.00f)
{ {
@ -3393,9 +3393,9 @@ void entityclass::animateentities( int _i )
entities[_i].drawframe += entities[_i].walkingframe + 1; entities[_i].drawframe += entities[_i].walkingframe + 1;
} }
if (entities[_i].onroof > 0) entities[_i].drawframe += 6; if (entities[_i].visualonroof > 0) entities[_i].drawframe += 6;
// Stuck in a wall? Then default to gravitycontrol // Stuck in a wall? Then default to gravitycontrol
if (entities[_i].onground > 0 && entities[_i].onroof > 0 if (entities[_i].visualonground > 0 && entities[_i].visualonroof > 0
&& game.gravitycontrol == 0) && game.gravitycontrol == 0)
{ {
entities[_i].drawframe -= 6; entities[_i].drawframe -= 6;
@ -3639,7 +3639,7 @@ void entityclass::animateentities( int _i )
entities[_i].drawframe=entities[_i].tile+3; entities[_i].drawframe=entities[_i].tile+3;
} }
if(entities[_i].onground>0 || entities[_i].onroof>0) if(entities[_i].visualonground>0 || entities[_i].visualonroof>0)
{ {
if(entities[_i].vx > 0.0000f || entities[_i].vx < -0.000f) if(entities[_i].vx > 0.0000f || entities[_i].vx < -0.000f)
{ {
@ -3653,7 +3653,7 @@ void entityclass::animateentities( int _i )
entities[_i].drawframe += entities[_i].walkingframe + 1; entities[_i].drawframe += entities[_i].walkingframe + 1;
} }
//if (entities[_i].onroof > 0) entities[_i].drawframe += 6; //if (entities[_i].visualonroof > 0) entities[_i].drawframe += 6;
} }
else else
{ {
@ -4489,12 +4489,14 @@ void entityclass::movingplatformfix( int t, int j )
entities[j].yp = entities[t].yp + entities[t].h; entities[j].yp = entities[t].yp + entities[t].h;
entities[j].vy = 0; entities[j].vy = 0;
entities[j].onroof = 2; entities[j].onroof = 2;
entities[j].visualonroof = entities[j].onroof;
} }
else else
{ {
entities[j].yp = entities[t].yp - entities[j].h-entities[j].cy; entities[j].yp = entities[t].yp - entities[j].h-entities[j].cy;
entities[j].vy = 0; entities[j].vy = 0;
entities[j].onground = 2; entities[j].onground = 2;
entities[j].visualonground = entities[j].onground;
} }
} }
else else

3
desktop_version/src/RenderFixed.cpp
View file

@ -45,6 +45,9 @@ void gamerenderfixed(void)
obj.entities[i].onroof--; obj.entities[i].onroof--;
} }
obj.entities[i].visualonground = obj.entities[i].onground;
obj.entities[i].visualonroof = obj.entities[i].onroof;
//Animate the entities //Animate the entities
obj.animateentities(i); obj.animateentities(i);
} }