Changeset 332 for code/branches/merger/src/network/Synchronisable.h

Timestamp:

Nov 28, 2007, 5:20:23 PM (16 years ago)

Author:

nicolasc

Message:

merge network

File:

• code/branches/merger/src/network/Synchronisable.h (modified) (4 diffs)

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

@@ -14 +14 @@
 
 #include <list>
+#include <iostream>
+
+#include "orxonox/core/IdentifierIncludes.h"
 
 namespace network {
@@ -20 +23 @@
 struct syncData{
   int length;
+  int objectID;
   int classID;
-  int objectID;
   unsigned char *data;
 };
@@ -40 +43 @@
   Synchronisable();
 
-  ~Synchronisable();
+  virtual ~Synchronisable();
   int objectID;
   int classID;
@@ -52 +55 @@
 
 private:
+/*  bool removeObject(Iterator<Synchronisable> it);*/
+  
   std::list<SYNCVAR> syncList;
   int datasize;