mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-22 00:39:46 +01:00
Code Issues Releases Wiki Activity

Revert "Document SDL_abs vs. SDL_fabs"

Browse source 
This reverts commit 8c472ed73d.
This commit is contained in:
leo60228 2021-01-01 21:37:54 -05:00 committed by Ethan Lee
parent 8c472ed73d
commit 91c3e6cbc5
2 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
desktop_version/src/Entity.cpp
View file

@ -4410,7 +4410,6 @@ 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;
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].vx) < xrate) entities[t].vx = 0.0f;
if (SDL_abs(entities[t].vy) < yrate) entities[t].vy = 0.0f; if (SDL_abs(entities[t].vy) < yrate) entities[t].vy = 0.0f;
} }

2
desktop_version/src/Input.cpp
View file

@ -1824,7 +1824,6 @@ void gameinput()
if (game.activetele && game.readytotele > 20 && !game.intimetrial) if (game.activetele && game.readytotele > 20 && !game.intimetrial)
{ {
enter_already_processed = true; 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(SDL_abs(obj.entities[ie].vx))<=1 && int(obj.entities[ie].vy)==0)
{ {
//wait! space station 2 debug thingy //wait! space station 2 debug thingy
@ -1891,7 +1890,6 @@ void gameinput()
else if (INBOUNDS_VEC(game.activeactivity, obj.blocks)) else if (INBOUNDS_VEC(game.activeactivity, obj.blocks))
{ {
enter_already_processed = true; 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(SDL_abs(obj.entities[ie].vx))<=1) && (int(obj.entities[ie].vy) == 0) )
{ {
script.load(obj.blocks[game.activeactivity].script); script.load(obj.blocks[game.activeactivity].script);