From 67958564315f0bcbcf8806435fa0f7003a0b3cf3 Mon Sep 17 00:00:00 2001 From: leo60228 Date: Fri, 1 Jan 2021 21:38:55 -0500 Subject: [PATCH] Use SDL_fabsf where std::abs was previously used --- desktop_version/src/Entity.cpp | 8 ++++---- desktop_version/src/Input.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index ab9e7948..a5090332 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -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 ) diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index ce0e1958..69a32bee 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -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);