Skip to content

Commit bbdbe62

Browse files
authored
Let SetOwner() assign the edict's ownerNum
1 parent b95241d commit bbdbe62

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

code/fgame/weaputils.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -940,6 +940,13 @@ void Projectile::SetSmashThroughGlass(Event *ev)
940940
}
941941

942942
void Projectile::SmashThroughGlassThink(Event *ev)
943+
{
944+
SmashThroughGlassThink();
945+
946+
PostEvent(EV_Projectile_SmashThroughGlass, level.frametime);
947+
}
948+
949+
void Projectile::SmashThroughGlassThink()
943950
{
944951
if (velocity.length() > m_iSmashThroughGlass) {
945952
Vector vEnd;
@@ -961,8 +968,6 @@ void Projectile::SmashThroughGlassThink(Event *ev)
961968
}
962969
}
963970
}
964-
965-
PostEvent(EV_Projectile_SmashThroughGlass, level.frametime);
966971
}
967972

968973
void Projectile::BeamCommand(Event *ev)
@@ -1918,7 +1923,6 @@ Projectile *ProjectileAttack(
19181923
proj->setMoveType(MOVETYPE_BOUNCE);
19191924
proj->ProcessInitCommands();
19201925
proj->SetOwner(owner);
1921-
proj->edict->r.ownerNum = owner->entnum;
19221926
proj->angles = dir.toAngles();
19231927
proj->charge_fraction = fraction;
19241928
proj->weap = weap;

code/fgame/weaputils.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,12 @@ class Projectile : public Animate
8787
bool m_bDieInWater;
8888
// Added in 2.0
8989
int m_iTeam;
90+
91+
//
92+
// Added in OPM
93+
//
9094
bool m_bHadPlayerOwner;
91-
SafePtr<Entity> m_pOwnerPtr;
95+
SafePtr<Entity> m_pOwnerPtr;
9296

9397
Projectile();
9498
void Archive( Archiver &arc ) override;
@@ -127,6 +131,7 @@ class Projectile : public Animate
127131
void HeatSeek( Event *ev );
128132
void Drunk( Event *ev );
129133
void SmashThroughGlassThink( Event *ev );
134+
void SmashThroughGlassThink(); // Added in OPM
130135
void AddOwnerVelocity( Event *ev );
131136
void Prethink( Event *ev );
132137
float ResolveMinimumDistance( Entity *potential_target, float currmin );
@@ -146,7 +151,7 @@ class Projectile : public Animate
146151
//
147152
// Added in OPM
148153
//
149-
bool CheckTeams( void );
154+
bool CheckTeams(void);
150155
};
151156

152157
inline void Projectile::SetMartyr(int entnum)

0 commit comments

Comments
 (0)