edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unweapons

Browse source
This commit is contained in:
def 2017-05-18 20:01:10 +02:00
parent 0f14307e8f
commit 819187f376
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/server/ddracecommands.cpp
View file

@ -209,7 +209,7 @@ void CGameContext::ConUnJetpack(IConsole::IResult *pResult, void *pUserData)
void CGameContext::ConUnWeapons(IConsole::IResult *pResult, void *pUserData) void CGameContext::ConUnWeapons(IConsole::IResult *pResult, void *pUserData)
{ {
CGameContext *pSelf = (CGameContext *) 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) void CGameContext::ConAddWeapon(IConsole::IResult *pResult, void *pUserData)

6
src/game/server/save.cpp
View file

@ -269,9 +269,6 @@ int CSaveTeam::load(int Team)
if(pTeams->Count(Team) > m_MembersCount) if(pTeams->Count(Team) > m_MembersCount)
return 2; return 2;
pTeams->ChangeTeamState(Team, m_TeamState);
pTeams->SetTeamLock(Team, m_TeamLocked);
CCharacter *pChr; CCharacter *pChr;
for (int i = 0; i < m_MembersCount; i++) 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++) for (int i = 0; i < m_MembersCount; i++)
{ {
pChr = MatchCharacter(SavedTees[i].GetName(), i); pChr = MatchCharacter(SavedTees[i].GetName(), i);