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

- floatified coordinate stuff in ThrowThing

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-28 12:54:54 +02:00
parent e8718826ba
commit e54719e6f5
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/games/blood/src/aiunicult.cpp
View file

@ -312,25 +312,23 @@ static void ThrowThing(DBloodActor* actor, bool impact)
else if (!playGenDudeSound(actor, kGenDudeSndAttackThrow))
sfxPlay3DSound(actor, 455, -1, 0);
int zThrow = 14500;
int dx = target->int_pos().X - actor->int_pos().X;
int dy = target->int_pos().Y - actor->int_pos().Y;
int dz = target->int_pos().Z - actor->int_pos().Z;
int dist = approxDist(dx, dy);
double zThrow = 14500 / 65536.;
auto dv = target->spr.pos - actor->spr.pos;
double dist = dv.Length();
auto actLeech = leechIsDropped(actor);
switch (curWeapon) {
case kModernThingEnemyLifeLeech:
case kThingDroppedLifeLeech:
zThrow = 5000;
zThrow = 5000 / 65536;
// pickup life leech before throw it again
if (actLeech != NULL) removeLeech(actLeech);
break;
}
DBloodActor* spawned = nullptr;
if ((spawned = actFireThing(actor, 0, 0, (dz / 128) - zThrow, curWeapon, DivScale(dist / 540, 120, 23))) == nullptr) return;
if ((spawned = actFireThing(actor, 0., 0., (dv.Z / 32768.) - zThrow, curWeapon, dist * (2048. / 64800))) == nullptr) return;
if (pThinkInfo->picnum < 0 && spawned->spr.type != kModernThingThrowableRock) spawned->spr.picnum = 0;