mpo
/
VVVVVV
mirror of https://github.com/TerryCavanagh/VVVVVV.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Compare commits

base: mpo:8c472ed73d660fdf813630375a546415a00d1beb
Branches Tags
mpo:master
mpo:2.4-updates
mpo:2.3-updates
mpo:2.4.1
mpo:2.4
mpo:2.3.6
mpo:2.3.5
mpo:2.3.4
mpo:2.3.3
mpo:2.3.2
mpo:2.3.1
mpo:2.3
mpo:2.2
..
compare: mpo:775ac4c40ce87ca846c1ab899d528059cb1c8949
Branches Tags
mpo:master
mpo:2.4-updates
mpo:2.3-updates
mpo:2.4.1
mpo:2.4
mpo:2.3.6
mpo:2.3.5
mpo:2.3.4
mpo:2.3.3
mpo:2.3.2
mpo:2.3.1
mpo:2.3
mpo:2.2

No commits in common. "8c472ed73d660fdf813630375a546415a00d1beb" and "775ac4c40ce87ca846c1ab899d528059cb1c8949" have entirely different histories.
8c472ed73d ... 775ac4c40c

2 changed files with 6 additions and 9 deletions
Show Stats Expand all files Collapse all files

9
desktop_version/src/Entity.cpp
View File

@ -4389,8 +4389,8 @@ void entityclass::fixfriction( int t, float xfix, float xrate, float yrate )
if (entities[t].vx > 6) entities[t].vx = 6.0f;
if (entities[t].vx < -6) entities[t].vx = -6.0f;
if (SDL_abs(entities[t].vx-xfix) <= xrate) entities[t].vx = xfix;
if (SDL_abs(entities[t].vy) < yrate) entities[t].vy = 0;
if (std::abs(entities[t].vx-xfix) <= xrate) entities[t].vx = xfix;
if (std::abs(entities[t].vy) < yrate) entities[t].vy = 0;
}
void entityclass::applyfriction( int t, float xrate, float yrate )
@ -4410,9 +4410,8 @@ void entityclass::applyfriction( int t, float xrate, float yrate )
if (entities[t].vx > 6.00f) entities[t].vx = 6.0f;
if (entities[t].vx < -6.00f) entities[t].vx = -6.0f;
// This should *not* be changed to use SDL_fabsf, which would cause noticable differences in physics.
if (SDL_abs(entities[t].vx) < xrate) entities[t].vx = 0.0f;
if (SDL_abs(entities[t].vy) < yrate) entities[t].vy = 0.0f;
if (std::abs(entities[t].vx) < xrate) entities[t].vx = 0.0f;
if (std::abs(entities[t].vy) < yrate) entities[t].vy = 0.0f;
}
void entityclass::updateentitylogic( int t )

6
desktop_version/src/Input.cpp
View File

@ -1824,8 +1824,7 @@ void gameinput()
if (game.activetele && game.readytotele > 20 && !game.intimetrial)
{
enter_already_processed = true;
// This should *not* be changed to use SDL_fabsf, which would prevent activating an teleporter when `vx > 1.0 && vx < 2.0`.
if(int(SDL_abs(obj.entities[ie].vx))<=1 && int(obj.entities[ie].vy)==0)
if(int(std::abs(obj.entities[ie].vx))<=1 && int(obj.entities[ie].vy)==0)
{
//wait! space station 2 debug thingy
if (game.teleportscript != "")
@ -1891,8 +1890,7 @@ void gameinput()
else if (INBOUNDS_VEC(game.activeactivity, obj.blocks))
{
enter_already_processed = true;
// This should *not* be changed to use SDL_fabsf, which would prevent activating an activity zone when `vx > 1.0 && vx < 2.0`.
if((int(SDL_abs(obj.entities[ie].vx))<=1) && (int(obj.entities[ie].vy) == 0) )
if((int(std::abs(obj.entities[ie].vx))<=1) && (int(obj.entities[ie].vy) == 0) )
{
script.load(obj.blocks[game.activeactivity].script);
obj.removeblock(game.activeactivity);