Changeset 1989 for code/branches/objecthierarchy/src/network

Timestamp:

Oct 21, 2008, 4:56:41 PM (16 years ago)

Author:

landauf

Message:

• added ControllableEntity, the baseclass of all players, vehicles and ships.
• moved Template to core
• some changes in Camera
• added 6 constants to WorldEntity to identify relative directions
• changed vom Radian to Degree as default angle unit

Location:

code/branches/objecthierarchy/src/network

Files:

• Synchronisable.cc (modified) (2 diffs)
• Synchronisable.h (modified) (1 diff)

code/branches/objecthierarchy/src/network/Synchronisable.cc

@@ -81 +81 @@
       for(std::list<synchronisableVariable *>::iterator it = syncList->begin(); it!=syncList->end(); it++)
         delete (*it)->callback;
-      deletedObjects_.push(objectID);
+      if (this->objectMode_ != 0x0)
+        deletedObjects_.push(objectID);
 //       COUT(3) << "destruct synchronisable +++" << objectID << " | " << classID << std::endl;
 //       COUT(3) << " bump ---" << objectID << " | " << &objectMap_ << std::endl;
@@ -418 +419 @@
    */
   void Synchronisable::setObjectMode(int mode){
-    assert(mode==0x1 || mode==0x2 || mode==0x3);
+    assert(mode==0x0 || mode==0x1 || mode==0x2 || mode==0x3);
     objectMode_=mode;
   }

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

@@ -48 +48 @@
 namespace network
 {
+  static const unsigned int OBJECTID_UNKNOWN = (unsigned int)-1;
+
   namespace direction{
     enum syncdirection{