mirror of
https://github.com/ZDoom/Raze.git
synced 2025-01-18 22:51:50 +00:00
- eliminated the deprecated integer wrapper for 'inside'.
This commit is contained in:
parent
0e113dab79
commit
01c114787c
3 changed files with 3 additions and 12 deletions
|
@ -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; k<endwall; k++)
|
||||
|
@ -527,7 +527,7 @@ CollisionBase clipmove_(vec3_t * const pos, int * const sectnum, int32_t xvect,
|
|||
{
|
||||
vec2_t const vec = pos->vec2;
|
||||
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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue