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

Use SDL_fabsf where std::abs was previously used

Browse source
This commit is contained in:
leo60228 2021-01-01 21:38:55 -05:00 committed by Ethan Lee
parent 91c3e6cbc5
commit 6795856431
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
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 (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_fabsf(entities[t].vx-xfix) <= xrate) entities[t].vx = xfix;
if (SDL_abs(entities[t].vy) < yrate) entities[t].vy = 0; if (SDL_fabsf(entities[t].vy) < yrate) entities[t].vy = 0;
} }
void entityclass::applyfriction( int t, float xrate, float yrate ) void entityclass::applyfriction( int t, float xrate, float yrate )
@ -4410,8 +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;
if (entities[t].vx < -6.00f) entities[t].vx = -6.0f; if (entities[t].vx < -6.00f) entities[t].vx = -6.0f;
if (SDL_abs(entities[t].vx) < xrate) entities[t].vx = 0.0f; if (SDL_fabsf(entities[t].vx) < xrate) entities[t].vx = 0.0f;
if (SDL_abs(entities[t].vy) < yrate) entities[t].vy = 0.0f; if (SDL_fabsf(entities[t].vy) < yrate) entities[t].vy = 0.0f;
} }
void entityclass::updateentitylogic( int t ) void entityclass::updateentitylogic( int t )

4
desktop_version/src/Input.cpp
View file

@ -1824,7 +1824,7 @@ 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;
if(int(SDL_abs(obj.entities[ie].vx))<=1 && int(obj.entities[ie].vy)==0) if(int(SDL_fabsf(obj.entities[ie].vx))<=1 && int(obj.entities[ie].vy)==0)
{ {
//wait! space station 2 debug thingy //wait! space station 2 debug thingy
if (game.teleportscript != "") if (game.teleportscript != "")
@ -1890,7 +1890,7 @@ 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;
if((int(SDL_abs(obj.entities[ie].vx))<=1) && (int(obj.entities[ie].vy) == 0) ) if((int(SDL_fabsf(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);
obj.removeblock(game.activeactivity); obj.removeblock(game.activeactivity);