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

engine: make cliptestsector() (used by clipmove(), etc) TROR aware

Browse source 
This is intended to help with issues where enemies get stuck in thin TROR layers.

# Conflicts:
#	source/build/src/clip.cpp
This commit is contained in:
Richard C. Gobeille 2020-05-12 16:19:36 -07:00 committed by Christoph Oelckers
parent 14f3eb17f1
commit 3ab314e95a
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -847,7 +847,11 @@ static int cliptestsector(int const dasect, int const nextsect, int32_t const fl
int32_t dacz2 = sec2->ceilingz;
if ((sec2->floorstat|sec2->ceilingstat) & 2)
#ifdef YAX_ENABLE
yax_getzsofslope(nextsect, pos.x, pos.y, &dacz2, &daz2);
#else
getcorrectzsofslope(nextsect, pos.x, pos.y, &dacz2, &daz2);
#endif
if (daz2 <= dacz2)
return 1;
@ -858,7 +862,11 @@ static int cliptestsector(int const dasect, int const nextsect, int32_t const fl
int32_t dacz = sec->ceilingz;
if ((sec->floorstat|sec->ceilingstat) & 2)
#ifdef YAX_ENABLE
yax_getzsofslope(dasect, pos.x, pos.y, &dacz, &daz);
#else
getcorrectzsofslope(dasect, pos.x, pos.y, &dacz, &daz);
#endif
int32_t const sec2height = klabs(daz2-dacz2);