From 819187f3768fcc251681df5d5594d593908408dd Mon Sep 17 00:00:00 2001 From: def Date: Thu, 18 May 2017 20:01:10 +0200 Subject: [PATCH] Fix unweapons --- src/game/server/ddracecommands.cpp | 2 +- src/game/server/save.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/server/ddracecommands.cpp b/src/game/server/ddracecommands.cpp index 7500920b8..6a8f68238 100644 --- a/src/game/server/ddracecommands.cpp +++ b/src/game/server/ddracecommands.cpp @@ -209,7 +209,7 @@ void CGameContext::ConUnJetpack(IConsole::IResult *pResult, void *pUserData) void CGameContext::ConUnWeapons(IConsole::IResult *pResult, void *pUserData) { CGameContext *pSelf = (CGameContext *) pUserData; - pSelf->ModifyWeapons(pResult, pUserData, -1, true); + pSelf->ModifyWeapons(pResult, pUserData, 0, true); } void CGameContext::ConAddWeapon(IConsole::IResult *pResult, void *pUserData) diff --git a/src/game/server/save.cpp b/src/game/server/save.cpp index 9f0d79c00..a3d89dcd7 100644 --- a/src/game/server/save.cpp +++ b/src/game/server/save.cpp @@ -269,9 +269,6 @@ int CSaveTeam::load(int Team) if(pTeams->Count(Team) > m_MembersCount) return 2; - pTeams->ChangeTeamState(Team, m_TeamState); - pTeams->SetTeamLock(Team, m_TeamLocked); - CCharacter *pChr; for (int i = 0; i < m_MembersCount; i++) @@ -291,6 +288,9 @@ int CSaveTeam::load(int Team) } } + pTeams->ChangeTeamState(Team, m_TeamState); + pTeams->SetTeamLock(Team, m_TeamLocked); + for (int i = 0; i < m_MembersCount; i++) { pChr = MatchCharacter(SavedTees[i].GetName(), i);