zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make getceilzofslopeptr/getflorzofslopeptr/getzsofslopeptr not invoke the structure trackers

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7583 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-04-18 17:23:53 +00:00 committed by Christoph Oelckers
parent b46bc73322
commit 5a814eb261
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/build/src/engine.cpp
View file

@ -11722,11 +11722,11 @@ int32_t getceilzofslopeptr(const usectortype *sec, int32_t dax, int32_t day)
if (!(sec->ceilingstat&2)) if (!(sec->ceilingstat&2))
return sec->ceilingz; return sec->ceilingz;
uwalltype const *wal = (uwalltype *)&wall[sec->wallptr]; uwalltype const *wal = (uwalltype *)&wall[sec->wallptr];
uwalltype const *wal2 = (uwalltype *)&wall[wal->point2];
// floor(sqrt(2**31-1)) == 46340
vec2_t const w = *(vec2_t const *)wal; vec2_t const w = *(vec2_t const *)wal;
vec2_t const d = { wall[wal->point2].x-w.x , wall[wal->point2].y-w.y }; vec2_t const d = { wal2->x - w.x, wal2->y - w.y };
int const i = nsqrtasm(uhypsq(d.x,d.y))<<5; int const i = nsqrtasm(uhypsq(d.x,d.y))<<5;
if (i == 0) return sec->ceilingz; if (i == 0) return sec->ceilingz;
@ -11740,10 +11740,11 @@ int32_t getflorzofslopeptr(const usectortype *sec, int32_t dax, int32_t day)
if (!(sec->floorstat&2)) if (!(sec->floorstat&2))
return sec->floorz; return sec->floorz;
uwalltype const *wal = (uwalltype *) &wall[sec->wallptr]; uwalltype const *wal = (uwalltype *)&wall[sec->wallptr];
uwalltype const *wal2 = (uwalltype *)&wall[wal->point2];
vec2_t const w = *(vec2_t const *)wal; vec2_t const w = *(vec2_t const *)wal;
vec2_t const d = { wall[wal->point2].x-w.x , wall[wal->point2].y-w.y }; vec2_t const d = { wal2->x - w.x, wal2->y - w.y };
int const i = nsqrtasm(uhypsq(d.x,d.y))<<5; int const i = nsqrtasm(uhypsq(d.x,d.y))<<5;
if (i == 0) return sec->floorz; if (i == 0) return sec->floorz;
@ -11759,9 +11760,10 @@ void getzsofslopeptr(const usectortype *sec, int32_t dax, int32_t day, int32_t *
if (((sec->ceilingstat|sec->floorstat)&2) != 2) if (((sec->ceilingstat|sec->floorstat)&2) != 2)
return; return;
uwalltype const *wal = (uwalltype *) &wall[sec->wallptr]; uwalltype const *wal = (uwalltype *)&wall[sec->wallptr];
uwalltype const *wal2 = (uwalltype *) &wall[wal->point2]; uwalltype const *wal2 = (uwalltype *)&wall[wal->point2];
vec2_t const d = { wal2->x-wal->x, wal2->y-wal->y };
vec2_t const d = { wal2->x - wal->x, wal2->y - wal->y };
int const i = nsqrtasm(uhypsq(d.x,d.y))<<5; int const i = nsqrtasm(uhypsq(d.x,d.y))<<5;
if (i == 0) return; if (i == 0) return;