mirror of
https://github.com/ZDoom/Raze.git
synced 2025-01-18 14:41:55 +00:00
- delete deprecated pushmove variants
This commit is contained in:
parent
2d91786516
commit
0ffe52791e
2 changed files with 0 additions and 40 deletions
|
@ -476,12 +476,6 @@ inline constexpr uint32_t uhypsq(int32_t const dx, int32_t const dy)
|
|||
return (uint32_t)dx*dx + (uint32_t)dy*dy;
|
||||
}
|
||||
|
||||
inline int32_t logapproach(int32_t const val, int32_t const targetval)
|
||||
{
|
||||
int32_t const dif = targetval - val;
|
||||
return (dif>>1) ? val + (dif>>1) : targetval;
|
||||
}
|
||||
|
||||
void rotatepoint(vec2_t const pivot, vec2_t p, int16_t const daang, vec2_t * const p2) ATTRIBUTE((nonnull(4)));
|
||||
inline void rotatepoint(int px, int py, int ptx, int pty, int daang, int* resx, int* resy)
|
||||
{
|
||||
|
|
|
@ -37,38 +37,4 @@ int32_t clipmove(vec3_t *const pos, int *const sectnum, int32_t xvect, int32_t y
|
|||
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) ATTRIBUTE((nonnull(1, 2)));
|
||||
|
||||
inline int pushmove(vec3_t *const vect, int16_t *const sectnum, int32_t const walldist, int32_t const ceildist, int32_t const flordist,
|
||||
uint32_t const cliptype, bool clear = true)
|
||||
{
|
||||
int sect16 = *sectnum;
|
||||
auto r = pushmove(vect, §16, walldist, ceildist, flordist, cliptype, clear);
|
||||
*sectnum = sect16;
|
||||
return r;
|
||||
}
|
||||
|
||||
[[deprecated]]
|
||||
inline int pushmove(int* x, int* y, int* z, int16_t* const sectnum, int32_t const walldist, int32_t const ceildist, int32_t const flordist,
|
||||
uint32_t const cliptype, bool clear = true)
|
||||
{
|
||||
vec3_t v = { *x,*y,*z };
|
||||
auto r = pushmove(&v, sectnum, walldist, ceildist, flordist, cliptype, clear);
|
||||
*x = v.x;
|
||||
*y = v.y;
|
||||
*z = v.z;
|
||||
return r;
|
||||
}
|
||||
|
||||
inline int pushmove(int* x, int* y, int* z, int* const sectnum, int32_t const walldist, int32_t const ceildist, int32_t const flordist,
|
||||
uint32_t const cliptype, bool clear = true)
|
||||
{
|
||||
short sect16 = *sectnum;
|
||||
vec3_t v = { *x,*y,*z };
|
||||
auto r = pushmove(&v, §16, walldist, ceildist, flordist, cliptype, clear);
|
||||
*sectnum = sect16;
|
||||
*x = v.x;
|
||||
*y = v.y;
|
||||
*z = v.z;
|
||||
return r;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue