zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- make internal pushmove use a 32 bit sector index.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-07 19:21:46 +01:00
parent 52a2862963
commit 4aa0477574
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/build/include/clip.h
View file

@ -34,13 +34,13 @@ extern int32_t clipmoveboxtracenum;
int32_t clipmove(vec3_t *const pos, int *const sectnum, int32_t xvect, int32_t yvect, int32_t const walldist, int32_t const ceildist,
int32_t const flordist, uint32_t const cliptype) ATTRIBUTE((nonnull(1, 2)));
int pushmove(vec3_t *const vect, int16_t *const sectnum, int32_t const walldist, int32_t const ceildist, int32_t const flordist,
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, int *const sectnum, int32_t const walldist, int32_t const ceildist, int32_t const flordist,
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)
{
short sect16 = *sectnum;
int sect16 = *sectnum;
auto r = pushmove(vect, &sect16, walldist, ceildist, flordist, cliptype, clear);
*sectnum = sect16;
return r;

9
source/build/src/clip.cpp
View file

@ -378,7 +378,7 @@ static int get_floorspr_clipyou(vec2_t const v1, vec2_t const v2, vec2_t const v
return clipyou;
}
static void clipupdatesector(vec2_t const pos, int16_t * const sectnum, int walldist)
static void clipupdatesector(vec2_t const pos, int * const sectnum, int walldist)
{
#if 0
if (enginecompatibility_mode != ENGINECOMPATIBILITY_NONE)
@ -774,10 +774,7 @@ int32_t clipmove(vec3_t * const pos, int * const sectnum, int32_t xvect, int32_t
if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
{
// the pervasiveness of 16 bit in the engine is staggering... :(
int16_t sect16 = *sectnum;
clipupdatesector(vec, &sect16, rad);
*sectnum = sect16;
clipupdatesector(vec, sectnum, rad);
}
pos->x = vec.x;
@ -840,7 +837,7 @@ int32_t clipmove(vec3_t * const pos, int * const sectnum, int32_t xvect, int32_t
//
// pushmove
//
int pushmove(vec3_t *const vect, int16_t *const sectnum,
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*/)
{
int bad;