@@ -151,7 +151,7 @@ void BulletExt::ExtData::InitializeLaserTrails()
151
151
}
152
152
}
153
153
154
- void BulletExt::ExtData::ApplyExtraWarheads (const std::vector<WarheadTypeClass*>& exWH, const std::vector<int >& exWHDamageOverrides , const std::vector<double >& exWHChances, const std::vector<bool >& exWHFull, const std::vector<bool >& exWHOwner, const CoordStruct& coords, HouseClass* pOwner, TechnoClass* pInvoker)
154
+ void BulletExt::ExtData::ApplyExtraWarheads (const std::vector<WarheadTypeClass*>& exWH, const std::vector<int >& exWHOverrides , const std::vector<double >& exWHChances, const std::vector<bool >& exWHFull, const std::vector<bool >& exWHOwner, const CoordStruct& coords, HouseClass* pOwner, TechnoClass* pInvoker)
155
155
{
156
156
auto const pThis = this ->OwnerObject ();
157
157
const int defaultDamage = pThis->WeaponType ? pThis->WeaponType ->Damage : 0 ;
@@ -168,12 +168,12 @@ void BulletExt::ExtData::ApplyExtraWarheads(const std::vector<WarheadTypeClass*>
168
168
}
169
169
170
170
int damage = defaultDamage;
171
- size_t size = exWHDamageOverrides .size ();
171
+ size_t size = exWHOverrides .size ();
172
172
173
173
if (size > i)
174
- damage = exWHDamageOverrides [i];
174
+ damage = exWHOverrides [i];
175
175
else if (size > 0 )
176
- damage = exWHDamageOverrides [size - 1 ];
176
+ damage = exWHOverrides [size - 1 ];
177
177
178
178
bool detonate = true ;
179
179
size = exWHChances.size ();
@@ -222,7 +222,7 @@ void BulletExt::ExtData::ApplyExtraWarheads(const std::vector<WarheadTypeClass*>
222
222
if (isFull)
223
223
WarheadTypeExt::DetonateAt (pWH, coords, pFirer, damage, pHouse, pThis->Target );
224
224
else
225
- WarheadTypeExt::ExtMap. Find (pWH) ->DamageAreaWithTarget (coords, damage, pFirer, pWH, true , pHouse, abstract_cast<TechnoClass*>(pThis->Target ));
225
+ pWHExt ->DamageAreaWithTarget (coords, damage, pFirer, pWH, true , pHouse, abstract_cast<TechnoClass*>(pThis->Target ));
226
226
}
227
227
}
228
228
0 commit comments