@@ -299,6 +299,8 @@ DEFINE_HOOK(0x469AA4, BulletClass_Logics_Extras, 0x5)
299
299
GET (BulletClass*, pThis, ESI);
300
300
GET_BASE (CoordStruct*, coords, 0x8 );
301
301
302
+ auto const pOwner = pThis->Owner ? pThis->Owner ->Owner : BulletExt::ExtMap.Find (pThis)->FirerHouse ;
303
+
302
304
// Extra warheads
303
305
if (pThis->WeaponType )
304
306
{
@@ -308,7 +310,6 @@ DEFINE_HOOK(0x469AA4, BulletClass_Logics_Extras, 0x5)
308
310
for (size_t i = 0 ; i < pWeaponExt->ExtraWarheads .size (); i++)
309
311
{
310
312
auto const pWH = pWeaponExt->ExtraWarheads [i];
311
- auto const pOwner = pThis->Owner ? pThis->Owner ->Owner : BulletExt::ExtMap.Find (pThis)->FirerHouse ;
312
313
int damage = defaultDamage;
313
314
size_t size = pWeaponExt->ExtraWarheads_DamageOverrides .size ();
314
315
@@ -359,10 +360,8 @@ DEFINE_HOOK(0x469AA4, BulletClass_Logics_Extras, 0x5)
359
360
pWeapon->Damage , pWeapon->Warhead , pWeapon->Speed , pWeapon->Bright ))
360
361
{
361
362
pBullet->WeaponType = pWeapon;
362
- auto const pBulletExt = BulletExt::ExtMap.Find (pBullet);
363
- pBulletExt->FirerHouse = pBulletExt->FirerHouse ;
364
-
365
363
pBullet->MoveTo (pThis->Location , BulletVelocity::Empty);
364
+ BulletExt::ExtMap.Find (pBullet)->FirerHouse = pOwner;
366
365
}
367
366
}
368
367
}
0 commit comments