[Supertuxkart-commit] SF.net SVN: supertuxkart:[13247] main/branches/hilnius/src

[<hi...@us...>]

Revision: 13247
          http://sourceforge.net/p/supertuxkart/code/13247
Author:   hilnius
Date:     2013-07-15 14:50:28 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
adding log

Modified Paths:
--------------
    main/branches/hilnius/src/network/protocol_manager.cpp
    main/branches/hilnius/src/network/protocols/start_game_protocol.cpp
    main/branches/hilnius/src/network/protocols/synchronization_protocol.cpp
    main/branches/hilnius/src/race/race_manager.cpp

Modified: main/branches/hilnius/src/network/protocol_manager.cpp
===================================================================
--- main/branches/hilnius/src/network/protocol_manager.cpp	2013-07-15 14:31:14 UTC (rev 13246)
+++ main/branches/hilnius/src/network/protocol_manager.cpp	2013-07-15 14:50:28 UTC (rev 13247)
@@ -34,7 +34,6 @@
     while(!manager->exit())
     {
         manager->update();
-        irr_driver->getDevice()->sleep(20);
     }
     return NULL;
 }

Modified: main/branches/hilnius/src/network/protocols/start_game_protocol.cpp
===================================================================
--- main/branches/hilnius/src/network/protocols/start_game_protocol.cpp	2013-07-15 14:31:14 UTC (rev 13246)
+++ main/branches/hilnius/src/network/protocols/start_game_protocol.cpp	2013-07-15 14:50:28 UTC (rev 13247)
@@ -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 @@
         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 @@
         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

Modified: main/branches/hilnius/src/network/protocols/synchronization_protocol.cpp
===================================================================
--- main/branches/hilnius/src/network/protocols/synchronization_protocol.cpp	2013-07-15 14:31:14 UTC (rev 13246)
+++ main/branches/hilnius/src/network/protocols/synchronization_protocol.cpp	2013-07-15 14:50:28 UTC (rev 13247)
@@ -109,11 +109,6 @@
     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 @@
             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);
+
 }
 
 //-----------------------------------------------------------------------------

Modified: main/branches/hilnius/src/race/race_manager.cpp
===================================================================
--- main/branches/hilnius/src/race/race_manager.cpp	2013-07-15 14:31:14 UTC (rev 13246)
+++ main/branches/hilnius/src/race/race_manager.cpp	2013-07-15 14:50:28 UTC (rev 13247)
@@ -461,6 +461,11 @@
         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
 
 //-----------------------------------------------------------------------------

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.