zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 18:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- 'effector->GetOwner()' was used a lot in this block...

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-13 23:32:38 +02:00
parent 4dfba60d99
commit b105897d9f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/games/duke/src/player_r.cpp
View file

@ -267,20 +267,20 @@ static void shootweapon(DDukeActor* actor, int p, DVector3 pos, DAngle ang, int
DukeStatIterator its(STAT_EFFECTOR);
while (auto effector = its.Next())
{
if (effector->sector() == hit.hitSector && effector->spr.picnum == SECTOREFFECTOR && effector->GetOwner()
&& effector->spr.lotag == SE_7_TELEPORT)
auto Owner = effector->GetOwner();
if (effector->sector() == hit.hitSector && effector->spr.picnum == SECTOREFFECTOR && Owner && effector->spr.lotag == SE_7_TELEPORT)
{
DVector3 npos;
npos.XY() = hit.hitpos.XY() + (effector->GetOwner()->spr.pos.XY() - effector->spr.pos.XY());
npos.XY() = hit.hitpos.XY() + (Owner->spr.pos.XY() - effector->spr.pos.XY());
if (hit.hitSector->lotag == 161)
{
npos.Z = effector->GetOwner()->sector()->floorz;
npos.Z = Owner->sector()->floorz;
}
else
{
npos.Z = effector->GetOwner()->sector()->ceilingz;
npos.Z = Owner->sector()->ceilingz;
}
hitscan(npos, effector->GetOwner()->sector(), DVector3(ang.ToVector() * 1024, zvel * 0.25), hit, CLIPMASK1);
hitscan(npos, Owner->sector(), DVector3(ang.ToVector() * 1024, zvel * 0.25), hit, CLIPMASK1);
break;
}
}