Skip to content

Commit 311984e

Browse files
committed
fix
1 parent 05243c2 commit 311984e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/Ext/Bullet/Body.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ void BulletExt::ExtData::InitializeLaserTrails()
151151
}
152152
}
153153

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)
155155
{
156156
auto const pThis = this->OwnerObject();
157157
const int defaultDamage = pThis->WeaponType ? pThis->WeaponType->Damage : 0;
@@ -168,12 +168,12 @@ void BulletExt::ExtData::ApplyExtraWarheads(const std::vector<WarheadTypeClass*>
168168
}
169169

170170
int damage = defaultDamage;
171-
size_t size = exWHDamageOverrides.size();
171+
size_t size = exWHOverrides.size();
172172

173173
if (size > i)
174-
damage = exWHDamageOverrides[i];
174+
damage = exWHOverrides[i];
175175
else if (size > 0)
176-
damage = exWHDamageOverrides[size - 1];
176+
damage = exWHOverrides[size - 1];
177177

178178
bool detonate = true;
179179
size = exWHChances.size();
@@ -222,7 +222,7 @@ void BulletExt::ExtData::ApplyExtraWarheads(const std::vector<WarheadTypeClass*>
222222
if (isFull)
223223
WarheadTypeExt::DetonateAt(pWH, coords, pFirer, damage, pHouse, pThis->Target);
224224
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));
226226
}
227227
}
228228

src/Ext/Bullet/Body.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class BulletExt
5454
void InterceptBullet(TechnoClass* pSource, WeaponTypeClass* pWeapon);
5555
void ApplyRadiationToCell(CellStruct cell, int spread, int radLevel);
5656
void InitializeLaserTrails();
57-
void 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 = nullptr);
57+
void 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 = nullptr);
5858

5959
private:
6060
template <typename T>

0 commit comments

Comments
 (0)