diff --git a/source/build/src/clip.cpp b/source/build/src/clip.cpp index 5b60a98e3..3d238cf7b 100644 --- a/source/build/src/clip.cpp +++ b/source/build/src/clip.cpp @@ -291,7 +291,7 @@ CollisionBase clipmove_(vec3_t * const pos, int * const sectnum, int32_t xvect, // We're not interested in any sector reached by portal traversal that we're "inside" of. if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE && !curspr && dasect != initialsectnum - && inside(pos->X, pos->Y, sec) == 1) + && inside(pos->X * inttoworld, pos->Y * inttoworld, sec) == 1) { int k; for (k=startwall; kvec2; keepaway(&pos->X, &pos->Y, i); - if (inside(pos->X,pos->Y, §or[*sectnum]) != 1) + if (inside(pos->X * inttoworld, pos->Y * inttoworld, §or[*sectnum]) != 1) pos->vec2 = vec; break; } diff --git a/source/core/coreactor.h b/source/core/coreactor.h index 4b00c66f4..281102b30 100644 --- a/source/core/coreactor.h +++ b/source/core/coreactor.h @@ -360,7 +360,7 @@ class TSectIterator { DCoreActor* next; public: - //[[deprecated]] + TSectIterator(int stat) { next = sector[stat].firstEntry; @@ -371,7 +371,6 @@ public: next = stat->firstEntry; } - //[[deprecated]] void Reset(int stat) { next = sector[stat].firstEntry; diff --git a/source/core/gamefuncs.h b/source/core/gamefuncs.h index cac1d3be6..5e6eb3c49 100644 --- a/source/core/gamefuncs.h +++ b/source/core/gamefuncs.h @@ -551,13 +551,5 @@ inline int rintersect(int x1, int y1, int z1, int vx, int vy, int vz, int x3, in return FloatToFixed(result); } -[[deprecated]] -inline int inside(int x, int y, const sectortype* sect) -{ - return inside(x * inttoworld, y * inttoworld, sect); -} - - - #include "updatesector.h"