From 449c91a65ebcf5555f81fcfafc7a4c4b26206316 Mon Sep 17 00:00:00 2001
From: Sin! <stkdm@yandex.ru>
Date: Sat, 5 Aug 2017 01:56:37 +1000
Subject: [PATCH] [Bugfix] Inversion of cartridges' order when switching to
 grenade mode

Ineffective and potentially buggy code changed to better one.
---
 src/xrGame/WeaponMagazinedWGrenade.cpp | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/xrGame/WeaponMagazinedWGrenade.cpp b/src/xrGame/WeaponMagazinedWGrenade.cpp
index dd07fd48cd6..4e1b8bd11bd 100644
--- a/src/xrGame/WeaponMagazinedWGrenade.cpp
+++ b/src/xrGame/WeaponMagazinedWGrenade.cpp
@@ -176,22 +176,7 @@ void CWeaponMagazinedWGrenade::PerformSwitchGL()
     swap(m_ammoType, m_ammoType2);
     swap(m_DefaultCartridge, m_DefaultCartridge2);
 
-    xr_vector<CCartridge> l_magazine;
-    while (m_magazine.size())
-    {
-        l_magazine.push_back(m_magazine.back());
-        m_magazine.pop_back();
-    }
-    while (m_magazine2.size())
-    {
-        m_magazine.push_back(m_magazine2.back());
-        m_magazine2.pop_back();
-    }
-    while (l_magazine.size())
-    {
-        m_magazine2.push_back(l_magazine.back());
-        l_magazine.pop_back();
-    }
+    m_magazine.swap(m_magazine2);
     iAmmoElapsed = (int)m_magazine.size();
 
     m_BriefInfo_CalcFrame = 0;