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

Merge pull request #2010 from heinrich5991/pr_fallthrough

Browse source 
Remove case fallthroughs from the code base
This commit is contained in:
oy 2019-02-03 13:28:32 +01:00 committed by GitHub
parent 802ecc5136 dbf056b253
commit 3b1bea2b8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 74 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/shared/console.cpp
View file

@ -723,7 +723,7 @@ void CConsole::ParseArguments(int NumArgs, const char **ppArguments)
for(int i = 0; i < NumArgs; i++) for(int i = 0; i < NumArgs; i++)
{ {
// check for scripts to execute // check for scripts to execute
if(ppArguments[i][0] == '-' && ppArguments[i][1] == 'f' && ppArguments[i][2] == 0) if(str_comp("-f", ppArguments[i]) == 0)
{ {
if(NumArgs - i > 1) if(NumArgs - i > 1)
ExecuteFile(ppArguments[i+1]); ExecuteFile(ppArguments[i+1]);

197
src/game/client/components/spectator.cpp
View file

@ -30,150 +30,89 @@ void CSpectator::ConSpectate(IConsole::IResult *pResult, void *pUserData)
pSelf->Spectate(pResult->GetInteger(0), pResult->GetInteger(1)); pSelf->Spectate(pResult->GetInteger(0), pResult->GetInteger(1));
} }
void CSpectator::ConSpectateNext(IConsole::IResult *pResult, void *pUserData) bool CSpectator::SpecModePossible(int SpecMode, int SpectatorID)
{ {
CSpectator *pSelf = (CSpectator *)pUserData; int i = SpectatorID;
if(!pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active || (pSelf->Client()->State() == IClient::STATE_DEMOPLAYBACK && pSelf->DemoPlayer()->GetDemoType() != IDemoPlayer::DEMOTYPE_SERVER)) switch(SpecMode)
return; {
int NewSpecMode = pSelf->m_pClient->m_Snap.m_SpecInfo.m_SpecMode;
int NewSpectatorID = -1;
bool GotNewSpectatorID = false;
if(NewSpecMode != SPEC_PLAYER)
NewSpecMode = (NewSpecMode + 1) % NUM_SPECMODES;
else
NewSpectatorID = pSelf->m_pClient->m_Snap.m_SpecInfo.m_SpectatorID;
switch(NewSpecMode)
{ // drop through
case SPEC_PLAYER: case SPEC_PLAYER:
for(int i = NewSpectatorID + 1; i < MAX_CLIENTS; i++) if(!m_pClient->m_aClients[i].m_Active || m_pClient->m_aClients[i].m_Team == TEAM_SPECTATORS)
{ {
if(!pSelf->m_pClient->m_aClients[i].m_Active || pSelf->m_pClient->m_aClients[i].m_Team == TEAM_SPECTATORS) return false;
continue;
if(pSelf->m_pClient->m_aClients[pSelf->m_pClient->m_LocalClientID].m_Team != TEAM_SPECTATORS &&
(i == pSelf->m_pClient->m_LocalClientID || pSelf->m_pClient->m_aClients[pSelf->m_pClient->m_LocalClientID].m_Team != pSelf->m_pClient->m_aClients[i].m_Team ||
(pSelf->m_pClient->m_Snap.m_paPlayerInfos[i] && (pSelf->m_pClient->m_Snap.m_paPlayerInfos[i]->m_PlayerFlags&PLAYERFLAG_DEAD))))
continue;
NewSpectatorID = i;
GotNewSpectatorID = true;
break;
} }
if(GotNewSpectatorID) if(m_pClient->m_aClients[m_pClient->m_LocalClientID].m_Team != TEAM_SPECTATORS &&
break; (i == m_pClient->m_LocalClientID || m_pClient->m_aClients[m_pClient->m_LocalClientID].m_Team != m_pClient->m_aClients[i].m_Team ||
NewSpecMode = SPEC_FLAGRED; (m_pClient->m_Snap.m_paPlayerInfos[i] && (m_pClient->m_Snap.m_paPlayerInfos[i]->m_PlayerFlags&PLAYERFLAG_DEAD))))
NewSpectatorID = -1; {
return false;
}
return true;
case SPEC_FLAGRED: case SPEC_FLAGRED:
case SPEC_FLAGBLUE: case SPEC_FLAGBLUE:
if(pSelf->m_pClient->m_GameInfo.m_GameFlags&GAMEFLAG_FLAGS) return m_pClient->m_GameInfo.m_GameFlags&GAMEFLAG_FLAGS;
{
GotNewSpectatorID = true;
break;
}
NewSpecMode = SPEC_FREEVIEW;
case SPEC_FREEVIEW: case SPEC_FREEVIEW:
if(pSelf->m_pClient->m_aClients[pSelf->m_pClient->m_LocalClientID].m_Team == TEAM_SPECTATORS) return m_pClient->m_aClients[m_pClient->m_LocalClientID].m_Team == TEAM_SPECTATORS;
GotNewSpectatorID = true; default:
else dbg_assert(false, "invalid spec mode");
return false;
}
}
static void IterateSpecMode(int Direction, int *pSpecMode, int *pSpectatorID)
{
dbg_assert(Direction == -1 || Direction == 1, "invalid direction");
if(*pSpecMode == SPEC_PLAYER)
{
*pSpectatorID += Direction;
if(0 <= *pSpectatorID && *pSpectatorID < MAX_CLIENTS)
{ {
// start again on the beginning in survival return;
for(int i = 0; i < pSelf->m_pClient->m_Snap.m_SpecInfo.m_SpectatorID; i++) }
{ *pSpectatorID = -1;
if(!pSelf->m_pClient->m_aClients[i].m_Active || pSelf->m_pClient->m_aClients[i].m_Team == TEAM_SPECTATORS) }
continue; *pSpecMode = (*pSpecMode + Direction + NUM_SPECMODES) % NUM_SPECMODES;
if(*pSpecMode == SPEC_PLAYER)
if(pSelf->m_pClient->m_aClients[pSelf->m_pClient->m_LocalClientID].m_Team != TEAM_SPECTATORS && {
(i == pSelf->m_pClient->m_LocalClientID || pSelf->m_pClient->m_aClients[pSelf->m_pClient->m_LocalClientID].m_Team != pSelf->m_pClient->m_aClients[i].m_Team || *pSpectatorID = 0;
(pSelf->m_pClient->m_Snap.m_paPlayerInfos[i] && (pSelf->m_pClient->m_Snap.m_paPlayerInfos[i]->m_PlayerFlags&PLAYERFLAG_DEAD)))) if(Direction == -1)
continue; {
*pSpectatorID = MAX_CLIENTS - 1;
NewSpecMode = SPEC_PLAYER;
NewSpectatorID = i;
GotNewSpectatorID = true;
break;
}
} }
} }
}
if(GotNewSpectatorID) void CSpectator::HandleSpectateNextPrev(int Direction)
pSelf->Spectate(NewSpecMode, NewSpectatorID); {
if(!m_pClient->m_Snap.m_SpecInfo.m_Active || (Client()->State() == IClient::STATE_DEMOPLAYBACK && DemoPlayer()->GetDemoType() != IDemoPlayer::DEMOTYPE_SERVER))
return;
int NewSpecMode = m_pClient->m_Snap.m_SpecInfo.m_SpecMode;
int NewSpectatorID = -1;
if(NewSpecMode == SPEC_PLAYER)
{
NewSpectatorID = m_pClient->m_Snap.m_SpecInfo.m_SpectatorID;
}
// Ensure the loop terminates even if no spec modes are possible.
for(int i = 0; i < NUM_SPECMODES + MAX_CLIENTS; i++)
{
IterateSpecMode(Direction, &NewSpecMode, &NewSpectatorID);
if(SpecModePossible(NewSpecMode, NewSpectatorID))
{
Spectate(NewSpecMode, NewSpectatorID);
return;
}
}
}
void CSpectator::ConSpectateNext(IConsole::IResult *pResult, void *pUserData)
{
((CSpectator *)pUserData)->HandleSpectateNextPrev(1);
} }
void CSpectator::ConSpectatePrevious(IConsole::IResult *pResult, void *pUserData) void CSpectator::ConSpectatePrevious(IConsole::IResult *pResult, void *pUserData)
{ {
CSpectator *pSelf = (CSpectator *)pUserData; ((CSpectator *)pUserData)->HandleSpectateNextPrev(-1);
if(!pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active || (pSelf->Client()->State() == IClient::STATE_DEMOPLAYBACK && pSelf->DemoPlayer()->GetDemoType() != IDemoPlayer::DEMOTYPE_SERVER))
return;
int NewSpecMode = pSelf->m_pClient->m_Snap.m_SpecInfo.m_SpecMode;
int NewSpectatorID = MAX_CLIENTS;
bool GotNewSpectatorID = false;
if(NewSpecMode != SPEC_PLAYER)
NewSpecMode = (NewSpecMode - 1 + NUM_SPECMODES) % NUM_SPECMODES;
else
NewSpectatorID = pSelf->m_pClient->m_Snap.m_SpecInfo.m_SpectatorID;
switch(NewSpecMode)
{ // drop through
case SPEC_FLAGBLUE:
case SPEC_FLAGRED:
if(pSelf->m_pClient->m_GameInfo.m_GameFlags&GAMEFLAG_FLAGS)
{
NewSpectatorID = -1;
GotNewSpectatorID = true;
break;
}
NewSpecMode = SPEC_PLAYER;
NewSpectatorID = MAX_CLIENTS;
case SPEC_PLAYER:
for(int i = NewSpectatorID - 1; i >= 0; i--)
{
if(!pSelf->m_pClient->m_aClients[i].m_Active || pSelf->m_pClient->m_aClients[i].m_Team == TEAM_SPECTATORS)
continue;
if(pSelf->m_pClient->m_aClients[pSelf->m_pClient->m_LocalClientID].m_Team != TEAM_SPECTATORS &&
(i == pSelf->m_pClient->m_LocalClientID || pSelf->m_pClient->m_aClients[pSelf->m_pClient->m_LocalClientID].m_Team != pSelf->m_pClient->m_aClients[i].m_Team ||
(pSelf->m_pClient->m_Snap.m_paPlayerInfos[i] && (pSelf->m_pClient->m_Snap.m_paPlayerInfos[i]->m_PlayerFlags&PLAYERFLAG_DEAD))))
continue;
NewSpectatorID = i;
GotNewSpectatorID = true;
break;
}
if(GotNewSpectatorID)
break;
NewSpecMode = SPEC_FREEVIEW;
case SPEC_FREEVIEW:
NewSpectatorID = -1;
if(pSelf->m_pClient->m_aClients[pSelf->m_pClient->m_LocalClientID].m_Team == TEAM_SPECTATORS)
GotNewSpectatorID = true;
else
{
// start again on the beginning in survival
for(int i = MAX_CLIENTS-1; i > pSelf->m_pClient->m_Snap.m_SpecInfo.m_SpectatorID; i--)
{
if(!pSelf->m_pClient->m_aClients[i].m_Active || pSelf->m_pClient->m_aClients[i].m_Team == TEAM_SPECTATORS)
continue;
if(pSelf->m_pClient->m_aClients[pSelf->m_pClient->m_LocalClientID].m_Team != TEAM_SPECTATORS &&
(i == pSelf->m_pClient->m_LocalClientID || pSelf->m_pClient->m_aClients[pSelf->m_pClient->m_LocalClientID].m_Team != pSelf->m_pClient->m_aClients[i].m_Team ||
(pSelf->m_pClient->m_Snap.m_paPlayerInfos[i] && (pSelf->m_pClient->m_Snap.m_paPlayerInfos[i]->m_PlayerFlags&PLAYERFLAG_DEAD))))
continue;
NewSpecMode = SPEC_PLAYER;
NewSpectatorID = i;
GotNewSpectatorID = true;
break;
}
}
}
if(GotNewSpectatorID)
pSelf->Spectate(NewSpecMode, NewSpectatorID);
} }
CSpectator::CSpectator() CSpectator::CSpectator()

3
src/game/client/components/spectator.h
View file

@ -20,6 +20,9 @@ class CSpectator : public CComponent
int m_SelectedSpecMode; int m_SelectedSpecMode;
vec2 m_SelectorMouse; vec2 m_SelectorMouse;
bool SpecModePossible(int SpecMode, int SpectatorID);
void HandleSpectateNextPrev(int Direction);
static void ConKeySpectator(IConsole::IResult *pResult, void *pUserData); static void ConKeySpectator(IConsole::IResult *pResult, void *pUserData);
static void ConSpectate(IConsole::IResult *pResult, void *pUserData); static void ConSpectate(IConsole::IResult *pResult, void *pUserData);
static void ConSpectateNext(IConsole::IResult *pResult, void *pUserData); static void ConSpectateNext(IConsole::IResult *pResult, void *pUserData);

4
src/game/server/gamecontroller.cpp
View file

@ -610,9 +610,9 @@ void IGameController::SetGameState(EGameState GameState, int Timer)
} }
break; break;
case IGS_END_ROUND: case IGS_END_ROUND:
if(DoWincheckMatch())
break;
case IGS_END_MATCH: case IGS_END_MATCH:
if(GameState == IGS_END_ROUND && DoWincheckMatch())
break;
// only possible when game is running or over // only possible when game is running or over
if(m_GameState == IGS_GAME_RUNNING || m_GameState == IGS_END_MATCH || m_GameState == IGS_END_ROUND || m_GameState == IGS_GAME_PAUSED) if(m_GameState == IGS_GAME_RUNNING || m_GameState == IGS_END_MATCH || m_GameState == IGS_END_ROUND || m_GameState == IGS_GAME_PAUSED)
{ {