File tree Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -296,16 +296,20 @@ bool Attachable::ParticlePenetration(HitData& hd) {
296
296
MovableObject* hitor = hd.Body [HITOR];
297
297
float damageToAdd = hitor->DamageOnCollision ();
298
298
damageToAdd += penetrated ? hitor->DamageOnPenetration () : 0 ;
299
- if (hitor->GetApplyWoundDamageOnCollision ()) {
300
- damageToAdd += m_pEntryWound->GetEmitDamage () * hitor->WoundDamageMultiplier ();
301
- }
302
- if (hitor->GetApplyWoundBurstDamageOnCollision ()) {
303
- damageToAdd += m_pEntryWound->GetBurstDamage () * hitor->WoundDamageMultiplier ();
299
+
300
+ if (m_pEntryWound) {
301
+ if (hitor->GetApplyWoundDamageOnCollision ()) {
302
+ damageToAdd += m_pEntryWound->GetEmitDamage () * hitor->WoundDamageMultiplier ();
303
+ }
304
+ if (hitor->GetApplyWoundBurstDamageOnCollision ()) {
305
+ damageToAdd += m_pEntryWound->GetBurstDamage () * hitor->WoundDamageMultiplier ();
306
+ }
304
307
}
305
308
306
309
if (damageToAdd != 0 ) {
307
310
AddDamage (damageToAdd);
308
311
}
312
+
309
313
if (penetrated || damageToAdd != 0 ) {
310
314
if (Actor* parentAsActor = dynamic_cast <Actor*>(GetRootParent ()); parentAsActor && parentAsActor->GetPerceptiveness () > 0 ) {
311
315
Vector extruded (hd.HitVel [HITOR]);
You can’t perform that action at this time.
0 commit comments