From 7ae8988dd0077a65b736dd7a725e2c37f2b0642b Mon Sep 17 00:00:00 2001 From: def Date: Fri, 1 May 2020 23:39:04 +0200 Subject: [PATCH] Don't load m_Ammo to fix loads (following #2086) As reported by Konsti, thanks to heinrich5991 for remembering #2086 --- src/game/server/save.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/game/server/save.cpp b/src/game/server/save.cpp index 4cc4697ed..2cb743d62 100644 --- a/src/game/server/save.cpp +++ b/src/game/server/save.cpp @@ -106,7 +106,8 @@ void CSaveTee::load(CCharacter *pChr, int Team) for(int i = 0; i< NUM_WEAPONS; i++) { pChr->m_aWeapons[i].m_AmmoRegenStart = m_aWeapons[i].m_AmmoRegenStart; - pChr->m_aWeapons[i].m_Ammo = m_aWeapons[i].m_Ammo; + // m_Ammo not used anymore for tracking freeze following https://github.com/ddnet/ddnet/pull/2086 + pChr->m_aWeapons[i].m_Ammo = -1; pChr->m_aWeapons[i].m_Ammocost = m_aWeapons[i].m_Ammocost; pChr->m_aWeapons[i].m_Got = m_aWeapons[i].m_Got; }