diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index a5090332..9cec4ee9 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -4372,27 +4372,6 @@ bool entityclass::testwallsy( int t, float tx, float ty ) return true; } -void entityclass::fixfriction( int t, float xfix, float xrate, float yrate ) -{ - if (!INBOUNDS_VEC(t, entities)) - { - puts("fixfriction() out-of-bounds!"); - return; - } - - if (entities[t].vx > xfix) entities[t].vx -= xrate; - if (entities[t].vx < xfix) entities[t].vx += xrate; - if (entities[t].vy > 0) entities[t].vy -= yrate; - if (entities[t].vy < 0) entities[t].vy += yrate; - if (entities[t].vy > 10) entities[t].vy = 10; - if (entities[t].vy < -10) entities[t].vy = -10; - if (entities[t].vx > 6) entities[t].vx = 6.0f; - if (entities[t].vx < -6) entities[t].vx = -6.0f; - - 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 ) { if (!INBOUNDS_VEC(t, entities)) diff --git a/desktop_version/src/Entity.h b/desktop_version/src/Entity.h index a6ebdafa..623559d5 100644 --- a/desktop_version/src/Entity.h +++ b/desktop_version/src/Entity.h @@ -157,8 +157,6 @@ public: bool testwallsy(int t, float tx, float ty); - void fixfriction(int t, float xfix, float xrate, float yrate); - void applyfriction(int t, float xrate, float yrate); void updateentitylogic(int t);