mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-23 01:59:43 +01:00
Use SDL_fabsf where std::abs was previously used
This commit is contained in:
parent
91c3e6cbc5
commit
6795856431
2 changed files with 6 additions and 6 deletions
|
@ -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 (SDL_fabsf(entities[t].vx-xfix) <= xrate) entities[t].vx = xfix;
|
||||
if (SDL_fabsf(entities[t].vy) < yrate) entities[t].vy = 0;
|
||||
}
|
||||
|
||||
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 (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_fabsf(entities[t].vx) < xrate) entities[t].vx = 0.0f;
|
||||
if (SDL_fabsf(entities[t].vy) < yrate) entities[t].vy = 0.0f;
|
||||
}
|
||||
|
||||
void entityclass::updateentitylogic( int t )
|
||||
|
|
|
@ -1824,7 +1824,7 @@ void gameinput()
|
|||
if (game.activetele && game.readytotele > 20 && !game.intimetrial)
|
||||
{
|
||||
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
|
||||
if (game.teleportscript != "")
|
||||
|
@ -1890,7 +1890,7 @@ void gameinput()
|
|||
else if (INBOUNDS_VEC(game.activeactivity, obj.blocks))
|
||||
{
|
||||
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);
|
||||
obj.removeblock(game.activeactivity);
|
||||
|
|
Loading…
Reference in a new issue