From 91c3e6cbc5af3ddc6261498ea2a17759e4f7a904 Mon Sep 17 00:00:00 2001 From: leo60228 Date: Fri, 1 Jan 2021 21:37:54 -0500 Subject: [PATCH] Revert "Document SDL_abs vs. SDL_fabs" This reverts commit 8c472ed73d660fdf813630375a546415a00d1beb. --- desktop_version/src/Entity.cpp | 1 - desktop_version/src/Input.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index 0079298d..ab9e7948 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -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; - // 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; } diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index 4259dc76..ce0e1958 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -1824,7 +1824,6 @@ 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) { //wait! space station 2 debug thingy @@ -1891,7 +1890,6 @@ 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) ) { script.load(obj.blocks[game.activeactivity].script);