ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding log

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13247 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hilnius 2013-07-15 14:50:28 +00:00
parent 3bb6122f8e
commit 83d64e6fc2
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/protocol_manager.cpp
View File

@ -34,7 +34,6 @@ void* protocolManagerUpdate(void* data)
while(!manager->exit())
{
manager->update();
irr_driver->getDevice()->sleep(20);
}
return NULL;
}

4
src/network/protocols/start_game_protocol.cpp
View File

@ -3,6 +3,7 @@
#include "network/network_manager.hpp"
#include "network/protocol_manager.hpp"
#include "network/game_setup.hpp"
#include "network/network_world.hpp"
#include "network/protocols/synchronization_protocol.hpp"
#include "race/race_manager.hpp"
#include "utils/log.hpp"
@ -88,7 +89,7 @@ void StartGameProtocol::update()
Log::info("StartGameProtocol", "SynchronizationProtocol started.");
// race startup sequence
NetworkWorld::getInstance<NetworkWorld>()->start(); // builds it and starts
race_manager->setNumKarts(m_game_setup->getPlayerCount());
race_manager->setNumPlayers(m_game_setup->getPlayerCount());
race_manager->setNumLocalPlayers(1);
@ -145,6 +146,7 @@ void StartGameProtocol::ready() // on clients, means the loading is finished
NetworkString ns;
ns.ai32(NetworkManager::getInstance()->getPeers()[0]->getClientServerToken()).ai8(1);
m_listener->sendMessage(this, ns, true);
Log::info("StartGameProtocol", "Player ready, sending message to server.");
m_state = READY;
}
else // on the server

13
src/network/protocols/synchronization_protocol.cpp
View File

@ -109,11 +109,6 @@ void SynchronizationProtocol::asynchronousUpdate()
double current_time = Time::getRealTime();
if (current_time > timer+0.1)
{
if (m_countdown_activated)
{
m_countdown -= (int)((current_time - m_last_countdown_update)*1000.0);
m_last_countdown_update = current_time;
}
std::vector<STKPeer*> peers = NetworkManager::getInstance()->getPeers();
for (unsigned int i = 0; i < peers.size(); i++)
{
@ -131,8 +126,14 @@ void SynchronizationProtocol::asynchronousUpdate()
m_listener->sendMessage(this, peers[i], ns, false);
m_pings_count[i]++;
}
Log::info("SynchronizationProtocol", "Countdown remaining : %d", m_countdown);
}
if (m_countdown_activated)
{
m_countdown -= (int)((current_time - m_last_countdown_update)*1000.0);
m_last_countdown_update = current_time;
}
Log::info("SynchronizationProtocol", "Update! Countdown remaining : %d", m_countdown);
}
//-----------------------------------------------------------------------------

5
src/race/race_manager.cpp
View File

@ -461,6 +461,11 @@ void RaceManager::startNextRace()
m_kart_status[i].m_last_score = m_kart_status[i].m_score;
m_kart_status[i].m_last_time = 0;
}
StartGameProtocol* protocol = static_cast<StartGameProtocol*>(
ProtocolManager::getInstance()->getProtocol(PROTOCOL_SYNCHRONIZATION));
if (protocol)
protocol->ready();
} // startNextRace
//-----------------------------------------------------------------------------