zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-23 01:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

- allow a bit of tolerance for attached orthogonal wall sprites.

Browse source 
We have to account for mappers adding some 'safe' distance (which isn't really safe!)
This commit is contained in:
Christoph Oelckers 2022-01-14 16:27:24 +01:00
parent 8281374551
commit ef711f0b2d
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/core/rendering/scene/hw_walls.cpp
View file

@ -50,6 +50,7 @@ DCoreActor* wall_to_sprite_actors[8]; // gets updated each frame. Todo: Encapsul
static walltype* IsOnWall(tspritetype* tspr, int height, DVector2& outpos)
{
const double maxorthdist = 3; // maximum orthogonal distance to be considered an attached sprite.
const double maxdistsq = (tspr->ang & 0x1ff)? 3 * 3 : 1; // lower tolerance for perfectly orthogonal sprites
auto sect = tspr->sectp;
@ -71,14 +72,14 @@ static walltype* IsOnWall(tspritetype* tspr, int height, DVector2& outpos)
// In Wanton Destruction's airplane level there's such a sprite assigned to the wrong sector.
if (d.X == 0)
{
if (tspr->pos.X == wal.pos.X)
if (fabs(tspr->pos.X - wal.pos.X) < maxorthdist);
{
closest = &wal;
}
}
else if (d.Y == 0)
{
if (tspr->pos.Y == wal.pos.Y)
if (fabs(tspr->pos.Y - wal.pos.Y) < maxorthdist);
{
closest = &wal;
}