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

a player can now start an online game. synchronization should work now

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13244 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hilnius
2013-07-15 13:50:39 +00:00
parent 13aa1d52c8
commit 4134f65dd7
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/network_world.cpp
View File

@@ -23,6 +23,12 @@ void NetworkWorld::update(float dt)
{
return;
}
else
{
// kill those two protocols
ProtocolManager::getInstance()->requestStop(protocol);
ProtocolManager::getInstance()->requestStop(ProtocolManager::getInstance()->getProtocol(PROTOCOL_START_GAME));
}
}
World::getWorld()->updateWorld(dt);
}

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

@@ -70,6 +70,7 @@ void SynchronizationProtocol::notifyEvent(Event* event)
{
uint16_t time_to_start = event->data.gui16(10);
Log::info("SynchronizationProtocol", "Starting game in %u.", time_to_start);
startCountdown(time_to_start);
}
else
Log::verbose("SynchronizationProtocol", "No countdown for now.");
@@ -97,6 +98,7 @@ void SynchronizationProtocol::notifyEvent(Event* event)
void SynchronizationProtocol::setup()
{
Log::info("SynchronizationProtocol", "Ready !");
m_countdown = 5000; // init the countdown to 5k
}
//-----------------------------------------------------------------------------
@@ -107,7 +109,7 @@ void SynchronizationProtocol::update()
double current_time = Time::getRealTime();
if (current_time > timer+0.1)
{
m_countdown -= (current_time - m_last_countdown_update);
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++)