teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-20 08:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- reinstated original distance math for SE20.

Browse source 
This one's a catastrophic combination of a bad algorithm depending on equally bad math to calculate distance.
It simply does not do what one would expect - it should have calculated the distance to a wall's center to be robust.
This commit is contained in:
Christoph Oelckers 2022-11-26 15:58:55 +01:00
parent adc2b884cd
commit 0e1121ed51
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/duke/src/savegame.cpp
View file

@ -282,7 +282,7 @@ void DDukeActor::Serialize(FSerializer& arc)
("temp_actor", temp_actor)
("seek_actor", seek_actor)
.Array("temp_data", temp_data, 6)
.Array("temo_wall", temp_walls, 2)
//.Array("temp_wall", temp_walls, 2)
("temp_angle", temp_angle)
("temp_pos", temp_pos)
("temp_pos2", temp_pos2)

23
source/games/duke/src/spawn.cpp
View file

@ -683,15 +683,32 @@ void spawneffector(DDukeActor* actor, TArray<DDukeActor*>* actors)
case SE_20_STRETCH_BRIDGE:
{
//find the two most clostest wall x's and y's
auto FindDistance2D = [](int x, int y)
{
x = abs(x);
y = abs(y);
if (x < y)
std::swap(x, y);
int t = y + (y >> 1);
return (x - (x >> 5) - (x >> 7) + (t >> 2) + (t >> 6));
};
//find the two most closest wall x's and y's
for (unsigned i = 0; i < 2; i++)
{
walltype* closewall = nullptr;
double maxdist = 0x7fffffff;
int maxdist = 0x7fffffff;
for (auto& wal : sectp->walls)
{
double dist = (actor->spr.pos.XY() - wal.pos).LengthSquared();
int x = int(actor->spr.pos.X - wal.pos.X) * 16;
int y = int(actor->spr.pos.Y - wal.pos.Y) * 16;
int dist = FindDistance2D(x, y);
if (dist < maxdist && &wal != actor->temp_walls[0])
{
maxdist = dist;