Changeset 496 for code/branches/FICN/src/network

Timestamp:

Dec 12, 2007, 10:37:30 PM (17 years ago)

Author:

landauf

Message:

added files from objecthierarchy, changed includes

Location:

code/branches/FICN/src/network

Files:

• Client.cc (modified) (1 diff)
• Client.h (modified) (1 diff)
• ConnectionManager.cc (modified) (1 diff)
• ConnectionManager.h (modified) (1 diff)
• GameStateClient.h (modified) (1 diff)
• GameStateManager.h (modified) (1 diff)
• Synchronisable.h (modified) (1 diff)

code/branches/FICN/src/network/Client.cc

@@ -170 +170 @@
   void Client::processClassid(classid *clid){
     orxonox::Identifier *id;
-    id=orxonox::ID(std::string(clid->message));
+    id=ID(std::string(clid->message));
     if(id!=NULL)
       id->setNetworkID(clid->clid);

code/branches/FICN/src/network/Client.h

@@ -19 +19 @@
 #include "PacketManager.h"
 #include "GameStateClient.h"
-#include "orxonox/core/IdentifierIncludes.h"
+#include "orxonox/core/CoreIncludes.h"
 //#include "NetworkFrameListener.h"
 

code/branches/FICN/src/network/ConnectionManager.cc

@@ -224 +224 @@
     orxonox::Identifier *id;
     while(!abort){
-      id = orxonox::ID(i);
+      id = ID(i);
       if(id == NULL)
         abort=true;

code/branches/FICN/src/network/ConnectionManager.h

@@ -24 +24 @@
 #include "PacketBuffer.h"
 #include "PacketManager.h"
-#include "orxonox/core/IdentifierIncludes.h"
+#include "orxonox/core/CoreIncludes.h"
 
 namespace std{

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

@@ -15 +15 @@
 #include "zlib.h"
 #include "Synchronisable.h"
-#include "orxonox/core/IdentifierIncludes.h"
+#include "orxonox/core/CoreIncludes.h"
 #include "GameStateManager.h"
 

code/branches/FICN/src/network/GameStateManager.h

@@ -19 +19 @@
 #include "ClientInformation.h"
 #include "Synchronisable.h"
-#include "orxonox/core/IdentifierIncludes.h"
+#include "orxonox/core/CoreIncludes.h"
 #include "orxonox/core/Iterator.h"
 #include "PacketTypes.h"

code/branches/FICN/src/network/Synchronisable.h

@@ -16 +16 @@
 #include <iostream>
 
-#include "orxonox/core/IdentifierIncludes.h"
+#include "orxonox/core/CoreIncludes.h"
 #include "orxonox/core/OrxonoxClass.h"