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

- floatify TraverseBreakableWalls.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-08 17:19:13 +02:00
parent 5f5b7d90f1
commit 2932cb81b2
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/games/sw/src/weapon.cpp
View file

@ -7325,16 +7325,15 @@ short StatBreakList[] =
STAT_DEAD_ACTOR,
};
void TraverseBreakableWalls(sectortype* start_sect, int x, int y, int z, short ang, int radius)
void TraverseBreakableWalls(sectortype* start_sect, const DVector3& pos, DAngle angle, double radius)
{
int k;
int xmid,ymid;
int dist;
DVector2 mid;
int break_count;
// limit radius
if (radius > 2000)
radius = 2000;
if (radius > 125)
radius = 125;
break_count = 0;
@ -7347,12 +7346,11 @@ void TraverseBreakableWalls(sectortype* start_sect, int x, int y, int z, short a
if (wal.lotag == TAG_WALL_BREAK)
{
// find midpoint
xmid = (wal.wall_int_pos().X + wal.point2Wall()->wall_int_pos().X) >> 1;
ymid = (wal.wall_int_pos().Y + wal.point2Wall()->wall_int_pos().Y) >> 1;
mid = wal.center();
// don't need to go further if wall is too far out
dist = Distance(xmid, ymid, x, y);
double dist = (mid - pos.XY()).Length();
if (dist > radius)
continue;
@ -7361,9 +7359,9 @@ void TraverseBreakableWalls(sectortype* start_sect, int x, int y, int z, short a
DAngle wall_ang;
if (WallBreakPosition(&wal, &sectp, hitpos, wall_ang))
{
if (sectp != nullptr && FAFcansee(DVector3(x* inttoworld, y* inttoworld, z* zinttoworld), start_sect, hitpos, sectp))
if (sectp != nullptr && FAFcansee(pos, start_sect, hitpos, sectp))
{
HitBreakWall(&wal, DVector3(INT32_MAX, INT32_MAX, INT32_MAX), DAngle::fromBuild(ang), 0);
HitBreakWall(&wal, DVector3(INT32_MAX, INT32_MAX, INT32_MAX), angle, 0);
break_count++;
if (break_count > 4)
@ -7451,7 +7449,7 @@ int DoExpDamageTest(DSWActor* actor)
if (actor->user.ID == MUSHROOM_CLOUD) return 0; // Central Nuke doesn't break stuff
// Only secondaries do that
TraverseBreakableWalls(actor->sector(), actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, actor->int_ang(), actor->user.Radius);
TraverseBreakableWalls(actor->sector(), actor->spr.pos, actor->spr.angle, actor->user.Radius);
break_count = 0;
max_stat = SIZ(StatBreakList);