zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-07 15:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed handling for Exhumed clipping mode.

Browse source 
All this does is disable slopes in a few places and use extremely less precise math. Nothing critical is guarded by it.
This commit is contained in:
Christoph Oelckers 2022-09-30 23:18:48 +02:00
parent 513fc478bf
commit a6b55dca74
3 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/build/include/build.h
View file

@ -51,9 +51,4 @@ inline constexpr uint32_t uhypsq(int32_t const dx, int32_t const dy)
return (uint32_t)dx*dx + (uint32_t)dy*dy; return (uint32_t)dx*dx + (uint32_t)dy*dy;
} }
static inline int64_t compat_maybe_truncate_to_int32(int64_t val)
{
return enginecompatibility_mode != ENGINECOMPATIBILITY_NONE ? (int32_t)val : val;
}
#endif // build_h_ #endif // build_h_

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

@ -109,8 +109,7 @@ inline void clipmove_tweak_pos(const vec3_t *pos, int32_t gx, int32_t gy, int32_
{ {
int32_t daz; int32_t daz;
if (enginecompatibility_mode == ENGINECOMPATIBILITY_19950829 || if (rintersect(pos->X, pos->Y, 0, gx, gy, 0, x1, y1, x2, y2, daxptr, dayptr, &daz) == -1)
rintersect(pos->X, pos->Y, 0, gx, gy, 0, x1, y1, x2, y2, daxptr, dayptr, &daz) == -1)
{ {
*daxptr = pos->X; *daxptr = pos->X;
*dayptr = pos->Y; *dayptr = pos->Y;
@ -287,7 +286,7 @@ CollisionBase clipmove_(vec3_t * const pos, int * const sectnum, int32_t xvect,
//Extra walldist for sprites on sector lines //Extra walldist for sprites on sector lines
vec2_t const diff = { goal.X - (pos->X), goal.Y - (pos->Y) }; vec2_t const diff = { goal.X - (pos->X), goal.Y - (pos->Y) };
int32_t const rad = ksqrt(compat_maybe_truncate_to_int32(uhypsq(diff.X, diff.Y))) + MAXCLIPDIST + walldist + 8; int32_t const rad = ksqrt(uhypsq(diff.X, diff.Y)) + MAXCLIPDIST + walldist + 8;
vec2_t const clipMin = { cent.X - rad, cent.Y - rad }; vec2_t const clipMin = { cent.X - rad, cent.Y - rad };
vec2_t const clipMax = { cent.X + rad, cent.Y + rad }; vec2_t const clipMax = { cent.X + rad, cent.Y + rad };
@ -601,34 +600,27 @@ CollisionBase clipmove_(vec3_t * const pos, int * const sectnum, int32_t xvect,
vec2_t const clipr = { clipit[hitwall].x2 - clipit[hitwall].x1, clipit[hitwall].y2 - clipit[hitwall].y1 }; vec2_t const clipr = { clipit[hitwall].x2 - clipit[hitwall].x1, clipit[hitwall].y2 - clipit[hitwall].y1 };
// clamp to the max value we can utilize without reworking the scaling below // clamp to the max value we can utilize without reworking the scaling below
// this works around the overflow issue that affects dukedc2.map // this works around the overflow issue that affects dukedc2.map
int32_t const templl = (int32_t)clamp<int64_t>(compat_maybe_truncate_to_int32((int64_t)clipr.X * clipr.X + (int64_t)clipr.Y * clipr.Y), INT32_MIN, INT32_MAX); int32_t const templl = (int32_t)clamp<int64_t>(((int64_t)clipr.X * clipr.X + (int64_t)clipr.Y * clipr.Y), INT32_MIN, INT32_MAX);
if (templl > 0) if (templl > 0)
{ {
// I don't know if this one actually overflows or not, but I highly doubt it hurts to check // I don't know if this one actually overflows or not, but I highly doubt it hurts to check
int32_t const templl2 int32_t const templl2
= (int32_t)clamp<int64_t>(compat_maybe_truncate_to_int32((int64_t)(goal.X - vec.X) * clipr.X + (int64_t)(goal.Y - vec.Y) * clipr.Y), INT32_MIN, INT32_MAX); = (int32_t)clamp<int64_t>(((int64_t)(goal.X - vec.X) * clipr.X + (int64_t)(goal.Y - vec.Y) * clipr.Y), INT32_MIN, INT32_MAX);
int32_t const i = (enginecompatibility_mode == ENGINECOMPATIBILITY_19950829 || (abs(templl2)>>11) < templl) ? int32_t const i = ((abs(templl2)>>11) < templl) ? (int)DivScaleL(templl2, templl, 20) : 0;
(int)DivScaleL(templl2, templl, 20) : 0;
goal = { MulScale(clipr.X, i, 20)+vec.X, MulScale(clipr.Y, i, 20)+vec.Y }; goal = { MulScale(clipr.X, i, 20)+vec.X, MulScale(clipr.Y, i, 20)+vec.Y };
} }
int32_t tempint; int32_t tempint;
if (enginecompatibility_mode == ENGINECOMPATIBILITY_19950829) tempint = DMulScale(clipr.X, move.X, clipr.Y, move.Y, 6);
tempint = clipr.X*(move.X>>6)+clipr.Y*(move.Y>>6);
else
tempint = DMulScale(clipr.X, move.X, clipr.Y, move.Y, 6);
for (int i=cnt+1, j; i<=clipmoveboxtracenum; ++i) for (int i=cnt+1, j; i<=clipmoveboxtracenum; ++i)
{ {
j = hitwalls[i]; j = hitwalls[i];
int32_t tempint2; int32_t tempint2;
if (enginecompatibility_mode == ENGINECOMPATIBILITY_19950829) tempint2 = DMulScale(clipit[j].x2-clipit[j].x1, move.X, clipit[j].y2-clipit[j].y1, move.Y, 6);
tempint2 = (clipit[j].x2-clipit[j].x1)*(move.X>>6)+(clipit[j].y2-clipit[j].y1)*(move.Y>>6);
else
tempint2 = DMulScale(clipit[j].x2-clipit[j].x1, move.X, clipit[j].y2-clipit[j].y1, move.Y, 6);
if ((tempint ^ tempint2) < 0) if ((tempint ^ tempint2) < 0)
{ {
@ -678,10 +670,7 @@ CollisionBase clipmove_(vec3_t * const pos, int * const sectnum, int32_t xvect,
auto sect = &sector[j]; auto sect = &sector[j];
if (inside(pos->X, pos->Y, sect) == 1) if (inside(pos->X, pos->Y, sect) == 1)
{ {
if (enginecompatibility_mode != ENGINECOMPATIBILITY_19950829 && (sect->ceilingstat & CSTAT_SECTOR_SLOPE)) tempint2 = int_getceilzofslopeptr(sect, pos->X, pos->Y) - pos->Z;
tempint2 = int_getceilzofslopeptr(sect, pos->X, pos->Y) - pos->Z;
else
tempint2 = int(sect->ceilingz * zworldtoint) - pos->Z;
if (tempint2 > 0) if (tempint2 > 0)
{ {
@ -693,10 +682,7 @@ CollisionBase clipmove_(vec3_t * const pos, int * const sectnum, int32_t xvect,
} }
else else
{ {
if (enginecompatibility_mode != ENGINECOMPATIBILITY_19950829 && (sect->ceilingstat & CSTAT_SECTOR_SLOPE)) tempint2 = pos->Z - int_getflorzofslopeptr(sect, pos->X, pos->Y);
tempint2 = pos->Z - int_getflorzofslopeptr(sect, pos->X, pos->Y);
else
tempint2 = pos->Z - int(sect->floorz * zworldtoint);
if (tempint2 <= 0) if (tempint2 <= 0)
{ {

2
source/games/exhumed/src/exhumed.cpp
View file

@ -574,7 +574,7 @@ void GameInterface::app_init()
resettiming(); resettiming();
GrabPalette(); GrabPalette();
enginecompatibility_mode = ENGINECOMPATIBILITY_19950829; enginecompatibility_mode = ENGINECOMPATIBILITY_19961112;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------