Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Network cleanup, refs #3752.

Browse Source 
Replace a TODO comment asking why something is set with a comment
answering that.

This was SVN commit r18268.
This commit is contained in:
elexis 2016-05-30 17:59:02 +00:00
parent b18c4ac217
commit ac4533f7df
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/network/NetServer.cpp
View File

@ -1072,6 +1072,7 @@ bool CNetServerWorker::OnInGame(void* context, CFsmEvent* event)
}
else if (message->GetType() == (uint)NMT_END_COMMAND_BATCH)
{
// The turn-length field is ignored
CEndCommandBatchMessage* endMessage = static_cast<CEndCommandBatchMessage*> (message);
server.m_ServerTurnManager->NotifyFinishedClientCommands(session->GetHostID(), endMessage->m_Turn);
}

11
source/network/NetTurnManager.cpp
View File

@ -422,10 +422,15 @@ void CNetClientTurnManager::NotifyFinishedOwnCommands(u32 turn)
{
NETTURN_LOG((L"NotifyFinishedOwnCommands(%d)\n", turn));
// Send message to the server
CEndCommandBatchMessage msg;
msg.m_TurnLength = DEFAULT_TURN_LENGTH_MP; // TODO: why do we send this?
msg.m_Turn = turn;
// The turn-length field of the CEndCommandBatchMessage is currently only relevant
// when sending it from the server to the clients.
// It could be used to verify that the client simulated the correct turn length.
msg.m_TurnLength = 0;
m_NetClient.SendMessage(&msg);
}
@ -607,7 +612,6 @@ void CNetServerTurnManager::CheckClientsReady()
return; // wasn't ready for m_ReadyTurn+1
}
// Advance the turn
++m_ReadyTurn;
NETTURN_LOG((L"CheckClientsReady: ready for turn %d\n", m_ReadyTurn));
@ -618,7 +622,6 @@ void CNetServerTurnManager::CheckClientsReady()
msg.m_Turn = m_ReadyTurn;
m_NetServer.Broadcast(&msg);
// Save the turn length in case it's needed later
ENSURE(m_SavedTurnLengths.size() == m_ReadyTurn);
m_SavedTurnLengths.push_back(m_TurnLength);
}