- removed the deprecated interfaces from coreactor.h

This commit is contained in:
Christoph Oelckers 2021-11-27 20:38:57 +01:00
parent b7a5ea8ef6
commit 6cecd85cf6

View file

@ -317,84 +317,6 @@ inline int SetActor(DCoreActor* actor, const vec3_t& newpos)
}
[[deprecated]]
inline int hitscan(const vec3_t* sv, int sectnum, int vx, int vy, int vz, hitdata_t* hitinfo, unsigned cliptype)
{
return hitscan_(sv, sectnum, vx, vy, vz, hitinfo, cliptype);
}
[[deprecated]]
inline int hitscan(int x, int y, int z, int sectnum, int vx, int vy, int vz,
short* hitsect, short* hitwall, short* hitspr, int* hitx, int* hity, int* hitz, uint32_t cliptype)
{
vec3_t v{ x,y,z };
hitdata_t hd{};
int res = hitscan_(&v, sectnum, vx, vy, vz, &hd, cliptype);
if (hitsect) *hitsect = hd.sect;
if (hitwall) *hitwall = hd.wall;
if (hitspr) *hitspr = hd.sprite;
*hitx = hd.pos.x;
*hity = hd.pos.y;
*hitz = hd.pos.z;
return res;
}
[[deprecated]]
inline int clipmove(vec3_t* const pos, int* const sectnum, int xvect, int yvect,
int const walldist, int const ceildist, int const flordist, uint32_t const cliptype, int clipmoveboxtracenum = 3)
{
return clipmove_(pos, sectnum, xvect, yvect, walldist, ceildist, flordist, cliptype, clipmoveboxtracenum);
}
[[deprecated]]
inline int32_t clipmove(vec3_t* const pos, sectortype** const sect, int32_t xvect, int32_t yvect,
int32_t const walldist, int32_t const ceildist, int32_t const flordist, uint32_t const cliptype, int clipmoveboxtracenum = 3)
{
int sectno = *sect ? sector.IndexOf(*sect) : -1;
int res = clipmove_(pos, &sectno, xvect, yvect, walldist, ceildist, flordist, cliptype, clipmoveboxtracenum);
*sect = sectno == -1 ? nullptr : &sector[sectno];
return res;
}
[[deprecated]]
inline void neartag(int32_t xs, int32_t ys, int32_t zs, int16_t sectnum, int16_t ange,
int16_t* neartagsector, int16_t* neartagwall, int16_t* neartagsprite,
int32_t* neartaghitdist, int32_t neartagrange, uint8_t tagsearch)
{
neartag_(xs, ys, zs, sectnum, ange, neartagsector, neartagwall, neartagsprite, neartaghitdist, neartagrange, tagsearch);
}
[[deprecated]]
inline void getzrange(const vec3_t* pos, int16_t sectnum, int32_t* ceilz, int32_t* ceilhit, int32_t* florz,
int32_t* florhit, int32_t walldist, uint32_t cliptype)
{
getzrange(pos, sectnum, ceilz, ceilhit, florz, florhit, walldist, cliptype);
}
[[deprecated]]
inline void getzrange(const vec3_t* pos, sectortype* sect, int32_t* ceilz, int32_t* ceilhit, int32_t* florz,
int32_t* florhit, int32_t walldist, uint32_t cliptype)
{
getzrange_(pos, sector.IndexOf(sect), ceilz, ceilhit, florz, florhit, walldist, cliptype);
}
[[deprecated]]
inline void getzrange(int x, int y, int z, int16_t sectnum, int32_t* ceilz, int32_t* ceilhit, int32_t* florz,
int32_t* florhit, int32_t walldist, uint32_t cliptype)
{
vec3_t v = { x, y, z };
getzrange_(&v, sectnum, ceilz, ceilhit, florz, florhit, walldist, cliptype);
}
[[deprecated]]
inline int pushmove(vec3_t* const vect, int* const sectnum, int32_t const walldist, int32_t const ceildist, int32_t const flordist,
uint32_t const cliptype, bool clear = true)
{
return pushmove_(vect, sectnum, walldist, ceildist, flordist, cliptype, clear);
}
inline int hitscan(const vec3_t& start, const sectortype* startsect, const vec3_t& direction, HitInfoBase& hitinfo, unsigned cliptype)
{