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

- length calculation in teslaHit.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-28 17:31:32 +02:00
parent 3814dfcf0e
commit f1b5bba035
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/games/blood/src/weapon.cpp
View file

@ -3001,9 +3001,8 @@ void teslaHit(DBloodActor* missileactor, int a2)
continue;
if (CheckSector(sectorMap, hitactor) && CheckProximity(hitactor, mpos, pSector, nDist))
{
int dx = missileactor->int_pos().X - hitactor->int_pos().X;
int dy = missileactor->int_pos().Y - hitactor->int_pos().Y;
int nDamage = ClipLow((nDist - (ksqrt(dx * dx + dy * dy) >> 4) + 20) >> 1, 10);
int length = int((missileactor->spr.pos.XY() - hitactor->spr.pos.XY()).Length());
int nDamage = ClipLow((nDist - length + 20) >> 1, 10);
if (hitactor == owneractor)
nDamage /= 2;
actDamageSprite(owneractor, hitactor, kDamageTesla, nDamage << 4);
@ -3019,9 +3018,8 @@ void teslaHit(DBloodActor* missileactor, int a2)
{
if (!hitactor->xspr.locked)
{
int dx = missileactor->int_pos().X - hitactor->int_pos().X;
int dy = missileactor->int_pos().Y - hitactor->int_pos().Y;
int nDamage = ClipLow(nDist - (ksqrt(dx * dx + dy * dy) >> 4) + 20, 20);
int length = int((missileactor->spr.pos.XY() - hitactor->spr.pos.XY()).Length());
int nDamage = ClipLow(nDist - length + 20, 20);
actDamageSprite(owneractor, hitactor, kDamageTesla, nDamage << 4);
}
}