[Orxonox-commit 408] r2992 - branches/netp3/src/network

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-05-19 22:05:30 +0200 (Tue, 19 May 2009)
New Revision: 2992

Modified:
   branches/netp3/src/network/Client.cc
   branches/netp3/src/network/ConnectionManager.cc
Log:
some fixes (in tick, getDeltaTime) and error output


Modified: branches/netp3/src/network/Client.cc
===================================================================
--- branches/netp3/src/network/Client.cc	2009-05-19 20:04:39 UTC (rev 2991)
+++ branches/netp3/src/network/Client.cc	2009-05-19 20:05:30 UTC (rev 2992)
@@ -141,7 +141,7 @@
    */
   void Client::update(const Clock& time){
     //this steers our network frequency
-    timeSinceLastUpdate_+=time;
+    timeSinceLastUpdate_+=time.getDeltaTime();
     if(timeSinceLastUpdate_>=NETWORK_PERIOD){
       timeSinceLastUpdate_ -= static_cast<unsigned int>( timeSinceLastUpdate_ / NETWORK_PERIOD ) * NETWORK_PERIOD;
       //     COUT(3) << ".";

Modified: branches/netp3/src/network/ConnectionManager.cc
===================================================================
--- branches/netp3/src/network/ConnectionManager.cc	2009-05-19 20:04:39 UTC (rev 2991)
+++ branches/netp3/src/network/ConnectionManager.cc	2009-05-19 20:05:30 UTC (rev 2992)
@@ -198,8 +198,8 @@
           // we should never reach this point
           printf("ConnectionManager: ENet returned with an error\n");
           quit_=true;
+          printf("waaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhhhhhhhhhhhhhhh\n");
           continue;
-          printf("waaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhhhhhhhhhhhhhhh");
           // add some error handling here ========================
         }
         lock.unlock();
@@ -207,7 +207,7 @@
       switch(event->type){
         // log handling ================
         case ENET_EVENT_TYPE_CONNECT:
-          printf("====================================================================");
+//             printf("====================================================================");
         case ENET_EVENT_TYPE_DISCONNECT:
         case ENET_EVENT_TYPE_RECEIVE:
             processData(event);