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

Merge pull request #8673 from Robyt3/Server-Swap-Solo-Message

Browse source 
Add error message when trying to `/swap` on forced solo server, minor cleanup
This commit is contained in:
Dennis Felsing 2024-08-01 22:18:00 +00:00 committed by GitHub
parent 44ff68a22e 7930eb9b79
commit c532aba4e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/game/server/ddracechat.cpp
View file

@ -744,6 +744,15 @@ void CGameContext::ConSwap(IConsole::IResult *pResult, void *pUserData)
return; return;
} }
if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
{
pSelf->Console()->Print(
IConsole::OUTPUT_LEVEL_STANDARD,
"chatresp",
"Swap is not available on forced solo servers.");
return;
}
CGameTeams &Teams = pSelf->m_pController->Teams(); CGameTeams &Teams = pSelf->m_pController->Teams();
int Team = Teams.m_Core.Team(pResult->m_ClientId); int Team = Teams.m_Core.Team(pResult->m_ClientId);
@ -804,7 +813,7 @@ void CGameContext::ConSwap(IConsole::IResult *pResult, void *pUserData)
} }
CPlayer *pSwapPlayer = pSelf->m_apPlayers[TargetClientId]; CPlayer *pSwapPlayer = pSelf->m_apPlayers[TargetClientId];
if((Team == TEAM_FLOCK || Teams.TeamFlock(Team)) && g_Config.m_SvTeam != 3) if(Team == TEAM_FLOCK || Teams.TeamFlock(Team))
{ {
CCharacter *pChr = pPlayer->GetCharacter(); CCharacter *pChr = pPlayer->GetCharacter();
CCharacter *pSwapChr = pSwapPlayer->GetCharacter(); CCharacter *pSwapChr = pSwapPlayer->GetCharacter();

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

@ -172,7 +172,7 @@ void CGameTeams::OnCharacterStart(int ClientId)
} }
} }
if(g_Config.m_SvTeam < SV_TEAM_FORCED_SOLO && g_Config.m_SvMaxTeamSize != 2 && g_Config.m_SvPauseable) if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && g_Config.m_SvMaxTeamSize != 2 && g_Config.m_SvPauseable)
{ {
for(int i = 0; i < MAX_CLIENTS; ++i) for(int i = 0; i < MAX_CLIENTS; ++i)
{ {