Changeset 1629 for code/branches/input/src/network

Timestamp:

Jun 27, 2008, 8:07:29 AM (16 years ago)

Author:

rgrieder

Message:

updated input branch

Location:

code/branches/input/src/network

Files:

• GameStateClient.cc (modified) (1 diff)
• GameStateClient.h (modified) (1 diff)
• Server.cc (modified) (2 diffs)

code/branches/input/src/network/GameStateClient.cc

@@ -34 +34 @@
 #include "core/BaseObject.h"
 #include "Synchronisable.h"
+#include "objects/SpaceShip.h"
 
 

code/branches/input/src/network/GameStateClient.h

@@ -44 +44 @@
 // 
 #include "NetworkPrereqs.h"
+#include "OrxonoxPrereqs.h"
 #include "core/CorePrereqs.h"
 #include "PacketTypes.h"
-#include "objects/SpaceShip.h"
+#include "Synchronisable.h"
 
 
 #define GAMESTATEID_INITIAL -1
+
 
 namespace network

code/branches/input/src/network/Server.cc

@@ -181 +181 @@
     timeSinceLastUpdate_+=time;
     if(timeSinceLastUpdate_>=(1./NETWORK_FREQUENCY)){
-      timeSinceLastUpdate_-=(1./NETWORK_FREQUENCY);
+      timeSinceLastUpdate_=(float)((int)(timeSinceLastUpdate_*NETWORK_FREQUENCY))/timeSinceLastUpdate_;
+//      timeSinceLastUpdate_-=1./NETWORK_FREQUENCY;
       gamestates->processGameStates();
       updateGamestate();
     }
+    /*while(timeSinceLastUpdate_>1./NETWORK_FREQUENCY)
+      timeSinceLastUpdate_-=1./NETWORK_FREQUENCY;*/
 //     usleep(5000); // TODO remove
     return;
@@ -217 +220 @@
             COUT(3) << "Server: could not elaborate" << std::endl;
         }
+        break;
+      default:
         break;
       }