Ticket #3643: defuse_v1.patch

File defuse_v1.patch, 817 bytes (added by elexis, 8 years ago)
  • source/network/NetTurnManager.cpp

    void CNetServerTurnManager::NotifyFinish  
    590590
    591591    // Must be a client we've already heard of
    592592    ENSURE(m_ClientsReady.find(client) != m_ClientsReady.end());
    593593
    594594    // Clients must advance one turn at a time
    595     ENSURE(turn == m_ClientsReady[client] + 1);
     595    if (turn != m_ClientsReady[client] + 1)
     596        LOGERROR("Client %d (%s) is ready for turn %d, but expected %d", client, utf8_from_wstring(m_ClientPlayernames[client]).c_str(), turn, m_ClientsReady[client] + 1);
     597
    596598    m_ClientsReady[client] = turn;
    597599
    598600    // Check whether this was the final client to become ready
    599601    CheckClientsReady();
    600602}