Changeset 871 for code/trunk/src/network

Timestamp:

Mar 9, 2008, 4:44:36 PM (17 years ago)

Author:

landauf

Message:

merged core branch to trunk

Location:

code/trunk/src/network

Files:

• GameStateClient.cc (modified) (1 diff)
• GameStateManager.cc (modified) (1 diff)
• Synchronisable.cc (modified) (1 diff)
• Synchronisable.h (modified) (4 diffs)

code/trunk/src/network/GameStateClient.cc

@@ -82 +82 @@
         // bad luck ;)
         // delete the synchronisable (obviously seems to be deleted on the server)
-        while(it != 0 && it->objectID!=sync.objectID){
+        while(it && it->objectID!=sync.objectID){
           removeObject(it);
         }

code/trunk/src/network/GameStateManager.cc

@@ -109 +109 @@
     int offset=0;
     // go through all Synchronisables
-    for(it = orxonox::ObjectList<Synchronisable>::start(); it != 0; ++it){
+    for(it = orxonox::ObjectList<Synchronisable>::start(); it; ++it){
       //std::cout << "gamestatemanager: in for loop" << std::endl;
       //get size of the synchronisable

code/trunk/src/network/Synchronisable.cc

@@ -14 +14 @@
 
 #include "Synchronisable.h"
+#include "core/CoreIncludes.h"
 
 namespace network

code/trunk/src/network/Synchronisable.h

@@ -2 +2 @@
 // C++ Interface: synchronisable
 //
-// Description: 
+// Description:
 //
 //
@@ -16 +16 @@
 
 #include "NetworkPrereqs.h"
-#include "core/CoreIncludes.h"
+#include "core/OrxonoxClass.h"
 
 namespace network
@@ -47 +47 @@
   public:
 
-    virtual ~Synchronisable();
+      virtual ~Synchronisable();
     int objectID;
     int classID;
@@ -66 +66 @@
     int datasize;
   };
-
-}
-
-namespace orxonox
-{
-  template class _NetworkExport ClassIdentifier<network::Synchronisable>;
-  template class _NetworkExport ObjectList<network::Synchronisable>;
 }