Skip to content

Commit 449c91a

Browse files
gunslingermodXottab-DUTY
authored andcommitted
[Bugfix] Inversion of cartridges' order when switching to grenade mode
Ineffective and potentially buggy code changed to better one.
1 parent 33f0521 commit 449c91a

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

src/xrGame/WeaponMagazinedWGrenade.cpp

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -176,22 +176,7 @@ void CWeaponMagazinedWGrenade::PerformSwitchGL()
176176
swap(m_ammoType, m_ammoType2);
177177
swap(m_DefaultCartridge, m_DefaultCartridge2);
178178

179-
xr_vector<CCartridge> l_magazine;
180-
while (m_magazine.size())
181-
{
182-
l_magazine.push_back(m_magazine.back());
183-
m_magazine.pop_back();
184-
}
185-
while (m_magazine2.size())
186-
{
187-
m_magazine.push_back(m_magazine2.back());
188-
m_magazine2.pop_back();
189-
}
190-
while (l_magazine.size())
191-
{
192-
m_magazine2.push_back(l_magazine.back());
193-
l_magazine.pop_back();
194-
}
179+
m_magazine.swap(m_magazine2);
195180
iAmmoElapsed = (int)m_magazine.size();
196181

197182
m_BriefInfo_CalcFrame = 0;

0 commit comments

Comments
 (0)