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

change /mode -> /flock

Browse source
This commit is contained in:
dobrykafe 2024-01-23 19:01:19 +01:00 committed by Dennis Felsing
parent 672cfb6236
commit 4c40e6c83f
8 changed files with 37 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -635,7 +635,7 @@ void CGameContext::ConPractice(IConsole::IResult *pResult, void *pUserData)
return;
}
if(Teams.TeamMode(Team))
if(Teams.TeamFlock(Team))
{
pSelf->Console()->Print(
IConsole::OUTPUT_LEVEL_STANDARD,
@ -781,7 +781,7 @@ void CGameContext::ConSwap(IConsole::IResult *pResult, void *pUserData)
}
CPlayer *pSwapPlayer = pSelf->m_apPlayers[TargetClientId];
if((Team == TEAM_FLOCK || Teams.TeamMode(Team)) && g_Config.m_SvTeam != 3)
if((Team == TEAM_FLOCK || Teams.TeamFlock(Team)) && g_Config.m_SvTeam != 3)
{
CCharacter *pChr = pPlayer->GetCharacter();
CCharacter *pSwapChr = pSwapPlayer->GetCharacter();
@ -791,7 +791,7 @@ void CGameContext::ConSwap(IConsole::IResult *pResult, void *pUserData)
return;
}
}
else if(!Teams.IsStarted(Team) && !Teams.TeamMode(Team))
else if(!Teams.IsStarted(Team) && !Teams.TeamFlock(Team))
{
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Need to have started the map to swap with a player.");
return;
@ -935,7 +935,7 @@ void CGameContext::ConLock(IConsole::IResult *pResult, void *pUserData)
{
pSelf->m_pController->Teams().SetTeamLock(Team, true);
if(pSelf->m_pController->Teams().TeamMode(Team))
if(pSelf->m_pController->Teams().TeamFlock(Team))
str_format(aBuf, sizeof(aBuf), "'%s' locked your team.", pSelf->Server()->ClientName(pResult->m_ClientId));
else
str_format(aBuf, sizeof(aBuf), "'%s' locked your team. After the race starts, killing will kill everyone in your team.", pSelf->Server()->ClientName(pResult->m_ClientId));
@ -1027,7 +1027,7 @@ void CGameContext::AttemptJoinTeam(int ClientId, int Team)
"This team is locked using /lock. Only members of the team can unlock it using /lock." :
"This team is locked using /lock. Only members of the team can invite you or unlock it using /lock.");
}
else if(Team > 0 && Team < MAX_CLIENTS && m_pController->Teams().Count(Team) >= g_Config.m_SvMaxTeamSize && !m_pController->Teams().TeamMode(Team))
else if(Team > 0 && Team < MAX_CLIENTS && m_pController->Teams().Count(Team) >= g_Config.m_SvMaxTeamSize && !m_pController->Teams().TeamFlock(Team))
{
char aBuf[512];
str_format(aBuf, sizeof(aBuf), "This team already has the maximum allowed size of %d players", g_Config.m_SvMaxTeamSize);
@ -1049,7 +1049,7 @@ void CGameContext::AttemptJoinTeam(int ClientId, int Team)
if(m_pController->Teams().IsPractice(Team))
SendChatTarget(pPlayer->GetCid(), "Practice mode enabled for your team, happy practicing!");
if(m_pController->Teams().TeamMode(Team))
if(m_pController->Teams().TeamFlock(Team))
SendChatTarget(pPlayer->GetCid(), "Team 0 mode enabled for your team, happy team 0-ing!");
}
}
@ -1119,7 +1119,7 @@ void CGameContext::ConInvite(IConsole::IResult *pResult, void *pUserData)
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Can't invite players to this team");
}
void CGameContext::ConMode(IConsole::IResult *pResult, void *pUserData)
void CGameContext::ConFlock(IConsole::IResult *pResult, void *pUserData)
{
CGameContext *pSelf = (CGameContext *)pUserData;
auto *pController = pSelf->m_pController;
@ -1135,7 +1135,7 @@ void CGameContext::ConMode(IConsole::IResult *pResult, void *pUserData)
}
int Team = pController->Teams().m_Core.Team(pResult->m_ClientId);
bool Mode = pController->Teams().TeamMode(Team);
bool Mode = pController->Teams().TeamFlock(Team);
if(Team <= TEAM_FLOCK || Team >= TEAM_SUPER)
{
@ -1168,7 +1168,7 @@ void CGameContext::ConMode(IConsole::IResult *pResult, void *pUserData)
}
else
{
pController->Teams().SetTeamMode(Team, false);
pController->Teams().SetTeamFlock(Team, false);
str_format(aBuf, sizeof(aBuf), "'%s' disabled team 0 mode.", pSelf->Server()->ClientName(pResult->m_ClientId));
pSelf->SendChatTeam(Team, aBuf);
@ -1176,7 +1176,7 @@ void CGameContext::ConMode(IConsole::IResult *pResult, void *pUserData)
}
else
{
pController->Teams().SetTeamMode(Team, true);
pController->Teams().SetTeamFlock(Team, true);
str_format(aBuf, sizeof(aBuf), "'%s' enabled team 0 mode.", pSelf->Server()->ClientName(pResult->m_ClientId));
pSelf->SendChatTeam(Team, aBuf);

6
src/game/server/entities/character.cpp
View file

@ -942,7 +942,7 @@ void CCharacter::Die(int Killer, int Weapon, bool SendKillMsg)
GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "game", aBuf);
// send the kill message
if(SendKillMsg && (Team() == TEAM_FLOCK || Teams()->TeamMode(Team()) || Teams()->Count(Team()) == 1 || Teams()->GetTeamState(Team()) == CGameTeams::TEAMSTATE_OPEN || Teams()->TeamLocked(Team()) == false))
if(SendKillMsg && (Team() == TEAM_FLOCK || Teams()->TeamFlock(Team()) || Teams()->Count(Team()) == 1 || Teams()->GetTeamState(Team()) == CGameTeams::TEAMSTATE_OPEN || Teams()->TeamLocked(Team()) == false))
{
CNetMsg_Sv_KillMsg Msg;
Msg.m_Killer = Killer;
@ -1773,7 +1773,7 @@ void CCharacter::HandleTiles(int Index)
m_StartTime -= (min * 60 + sec) * Server()->TickSpeed();
if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || (Team != TEAM_FLOCK && !Teams()->TeamMode(Team))) && Team != TEAM_SUPER)
if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || (Team != TEAM_FLOCK && !Teams()->TeamFlock(Team))) && Team != TEAM_SUPER)
{
for(int i = 0; i < MAX_CLIENTS; i++)
{
@ -1799,7 +1799,7 @@ void CCharacter::HandleTiles(int Index)
if(m_StartTime > Server()->Tick())
m_StartTime = Server()->Tick();
if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || (Team != TEAM_FLOCK && !Teams()->TeamMode(Team))) && Team != TEAM_SUPER)
if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || (Team != TEAM_FLOCK && !Teams()->TeamFlock(Team))) && Team != TEAM_SUPER)
{
for(int i = 0; i < MAX_CLIENTS; i++)
{

1
src/game/server/gamecontext.h
View file

@ -445,6 +445,7 @@ private:
static void ConInvite(IConsole::IResult *pResult, void *pUserData);
static void ConJoin(IConsole::IResult *pResult, void *pUserData);
static void ConMode(IConsole::IResult *pResult, void *pUserData);
static void ConFlock(IConsole::IResult *pResult, void *pUserData);
static void ConMe(IConsole::IResult *pResult, void *pUserData);
static void ConWhisper(IConsole::IResult *pResult, void *pUserData);
static void ConConverse(IConsole::IResult *pResult, void *pUserData);

2
src/game/server/gamemodes/DDRace.cpp
View file

@ -67,7 +67,7 @@ void CGameControllerDDRace::HandleCharacterTiles(CCharacter *pChr, int MapIndex)
pChr->Die(ClientId, WEAPON_WORLD);
return;
}
if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && Team > TEAM_FLOCK && Team < TEAM_SUPER && Teams().Count(Team) < g_Config.m_SvMinTeamSize && !Teams().TeamMode(Team))
if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && Team > TEAM_FLOCK && Team < TEAM_SUPER && Teams().Count(Team) < g_Config.m_SvMinTeamSize && !Teams().TeamFlock(Team))
{
char aBuf[128];
str_format(aBuf, sizeof(aBuf), "Your team has fewer than %d players, so your team rank won't count", g_Config.m_SvMinTeamSize);

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

@ -481,7 +481,7 @@ int CSaveTeam::Save(CGameContext *pGameServer, int Team, bool Dry)
IGameController *pController = pGameServer->m_pController;
CGameTeams *pTeams = &pController->Teams();
if(pTeams->TeamMode(Team))
if(pTeams->TeamFlock(Team))
{
return 5;
}

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

@ -345,7 +345,7 @@ void CScore::LoadTeam(const char *pCode, int ClientId)
GameServer()->SendChatTarget(ClientId, "Team can't be loaded while racing");
return;
}
if(pController->Teams().TeamMode(Team))
if(pController->Teams().TeamFlock(Team))
{
GameServer()->SendChatTarget(ClientId, "Team can't be loaded while in team 0 mode");
return;

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

@ -32,7 +32,7 @@ void CGameTeams::Reset()
{
m_aTeamState[i] = TEAMSTATE_EMPTY;
m_aTeamLocked[i] = false;
m_aTeamMode[i] = false;
m_aTeamFlock[i] = false;
m_apSaveTeamResult[i] = nullptr;
m_aTeamSentStartWarning[i] = false;
ResetRoundState(i);
@ -76,12 +76,12 @@ void CGameTeams::OnCharacterStart(int ClientId)
return;
if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO && pStartingChar->m_DDRaceState == DDRACE_STARTED)
return;
if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || (m_Core.Team(ClientId) != TEAM_FLOCK && !m_aTeamMode[m_Core.Team(ClientId)])) && pStartingChar->m_DDRaceState == DDRACE_FINISHED)
if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || (m_Core.Team(ClientId) != TEAM_FLOCK && !m_aTeamFlock[m_Core.Team(ClientId)])) && pStartingChar->m_DDRaceState == DDRACE_FINISHED)
return;
if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO &&
(m_Core.Team(ClientId) == TEAM_FLOCK || TeamMode(m_Core.Team(ClientId)) || m_Core.Team(ClientId) == TEAM_SUPER))
(m_Core.Team(ClientId) == TEAM_FLOCK || TeamFlock(m_Core.Team(ClientId)) || m_Core.Team(ClientId) == TEAM_SUPER))
{
if(TeamMode(m_Core.Team(ClientId)) && (m_aTeamState[m_Core.Team(ClientId)] < TEAMSTATE_STARTED))
if(TeamFlock(m_Core.Team(ClientId)) && (m_aTeamState[m_Core.Team(ClientId)] < TEAMSTATE_STARTED))
ChangeTeamState(m_Core.Team(ClientId), TEAMSTATE_STARTED);
m_aTeeStarted[ClientId] = true;
@ -188,7 +188,7 @@ void CGameTeams::OnCharacterStart(int ClientId)
void CGameTeams::OnCharacterFinish(int ClientId)
{
if(((m_Core.Team(ClientId) == TEAM_FLOCK || m_aTeamMode[m_Core.Team(ClientId)]) && g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO) || m_Core.Team(ClientId) == TEAM_SUPER)
if(((m_Core.Team(ClientId) == TEAM_FLOCK || m_aTeamFlock[m_Core.Team(ClientId)]) && g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO) || m_Core.Team(ClientId) == TEAM_SUPER)
{
CPlayer *pPlayer = GetPlayer(ClientId);
if(pPlayer && pPlayer->IsPlaying())
@ -254,7 +254,7 @@ void CGameTeams::Tick()
{
CCharacter *pChar = GameServer()->m_apPlayers[i] ? GameServer()->m_apPlayers[i]->GetCharacter() : nullptr;
int Team = m_Core.Team(i);
if(!pChar || m_aTeamState[Team] != TEAMSTATE_STARTED || m_aTeamMode[Team] || m_aTeeStarted[i] || m_aPractice[m_Core.Team(i)])
if(!pChar || m_aTeamState[Team] != TEAMSTATE_STARTED || m_aTeamFlock[Team] || m_aTeeStarted[i] || m_aPractice[m_Core.Team(i)])
{
continue;
}
@ -376,7 +376,7 @@ const char *CGameTeams::SetCharacterTeam(int ClientId, int Team)
return "Invalid client ID";
if(Team < 0 || Team >= MAX_CLIENTS + 1)
return "Invalid team number";
if(Team != TEAM_SUPER && m_aTeamState[Team] > TEAMSTATE_OPEN && !m_aPractice[Team] && !m_aTeamMode[Team])
if(Team != TEAM_SUPER && m_aTeamState[Team] > TEAMSTATE_OPEN && !m_aPractice[Team] && !m_aTeamFlock[Team])
return "This team started already";
if(m_Core.Team(ClientId) == Team)
return "You are in this team already";
@ -416,7 +416,7 @@ void CGameTeams::SetForceCharacterTeam(int ClientId, int Team)
// unlock team when last player leaves
SetTeamLock(OldTeam, false);
SetTeamMode(OldTeam, false);
SetTeamFlock(OldTeam, false);
ResetRoundState(OldTeam);
// do not reset SaveTeamResult, because it should be logged into teehistorian even if the team leaves
}
@ -438,7 +438,7 @@ void CGameTeams::SetForceCharacterTeam(int ClientId, int Team)
m_pGameContext->m_World.RemoveEntitiesFromPlayer(ClientId);
}
if(Team != TEAM_SUPER && (m_aTeamState[Team] == TEAMSTATE_EMPTY || (m_aTeamLocked[Team] && !m_aTeamMode[Team])))
if(Team != TEAM_SUPER && (m_aTeamState[Team] == TEAMSTATE_EMPTY || (m_aTeamLocked[Team] && !m_aTeamFlock[Team])))
{
if(!m_aTeamLocked[Team])
ChangeTeamState(Team, TEAMSTATE_OPEN);
@ -936,7 +936,7 @@ void CGameTeams::SwapTeamCharacters(CPlayer *pPrimaryPlayer, CPlayer *pTargetPla
PrimarySavedTee.Load(pTargetPlayer->GetCharacter(), Team, true);
SecondarySavedTee.Load(pPrimaryPlayer->GetCharacter(), Team, true);
if(Team >= 1 && !m_aTeamMode[Team])
if(Team >= 1 && !m_aTeamFlock[Team])
{
for(const auto &pPlayer : GameServer()->m_apPlayers)
{
@ -1052,7 +1052,7 @@ void CGameTeams::OnCharacterSpawn(int ClientId)
SetForceCharacterTeam(ClientId, TEAM_FLOCK);
else
SetForceCharacterTeam(ClientId, ClientId); // initialize team
if(!m_aTeamMode[Team])
if(!m_aTeamFlock[Team])
CheckTeamFinished(Team);
}
}
@ -1089,7 +1089,7 @@ void CGameTeams::OnCharacterDeath(int ClientId, int Weapon)
{
SetForceCharacterTeam(ClientId, Team);
if(GetTeamState(Team) != TEAMSTATE_OPEN && !m_aTeamMode[m_Core.Team(ClientId)])
if(GetTeamState(Team) != TEAMSTATE_OPEN && !m_aTeamFlock[m_Core.Team(ClientId)])
{
ChangeTeamState(Team, CGameTeams::TEAMSTATE_OPEN);
@ -1108,7 +1108,7 @@ void CGameTeams::OnCharacterDeath(int ClientId, int Weapon)
}
else
{
if(m_aTeamState[m_Core.Team(ClientId)] == CGameTeams::TEAMSTATE_STARTED && !m_aTeeStarted[ClientId] && !m_aTeamMode[m_Core.Team(ClientId)])
if(m_aTeamState[m_Core.Team(ClientId)] == CGameTeams::TEAMSTATE_STARTED && !m_aTeeStarted[ClientId] && !m_aTeamFlock[m_Core.Team(ClientId)])
{
char aBuf[128];
str_format(aBuf, sizeof(aBuf), "This team cannot finish anymore because '%s' left the team before hitting the start", Server()->ClientName(ClientId));
@ -1119,7 +1119,7 @@ void CGameTeams::OnCharacterDeath(int ClientId, int Weapon)
ChangeTeamState(Team, CGameTeams::TEAMSTATE_STARTED_UNFINISHABLE);
}
SetForceCharacterTeam(ClientId, TEAM_FLOCK);
if(!m_aTeamMode[m_Core.Team(ClientId)])
if(!m_aTeamFlock[m_Core.Team(ClientId)])
CheckTeamFinished(Team);
}
}
@ -1130,10 +1130,10 @@ void CGameTeams::SetTeamLock(int Team, bool Lock)
m_aTeamLocked[Team] = Lock;
}
void CGameTeams::SetTeamMode(int Team, bool Mode)
void CGameTeams::SetTeamFlock(int Team, bool Mode)
{
if(Team > TEAM_FLOCK && Team < TEAM_SUPER)
m_aTeamMode[Team] = Mode;
m_aTeamFlock[Team] = Mode;
}
void CGameTeams::ResetInvited(int Team)

8
src/game/server/teams.h
View file

@ -25,7 +25,7 @@ class CGameTeams
int m_aTeamState[NUM_TEAMS];
bool m_aTeamLocked[NUM_TEAMS];
bool m_aTeamMode[NUM_TEAMS];
bool m_aTeamFlock[NUM_TEAMS];
CClientMask m_aInvited[NUM_TEAMS];
bool m_aPractice[NUM_TEAMS];
std::shared_ptr<CScoreSaveResult> m_apSaveTeamResult[NUM_TEAMS];
@ -110,7 +110,7 @@ public:
void SendTeamsState(int ClientId);
void SetTeamLock(int Team, bool Lock);
void SetTeamMode(int Team, bool Mode);
void SetTeamFlock(int Team, bool Mode);
void ResetInvited(int Team);
void SetClientInvited(int Team, int ClientId, bool Invited);
@ -151,12 +151,12 @@ public:
return m_aTeamLocked[Team];
}
bool TeamMode(int Team)
bool TeamFlock(int Team)
{
if(Team <= TEAM_FLOCK || Team >= TEAM_SUPER)
return false;
return m_aTeamMode[Team];
return m_aTeamFlock[Team];
}
bool IsInvited(int Team, int ClientId)