Changeset 2422 for code/branches/objecthierarchy2/src/network/Synchronisable.cc

Timestamp:

Dec 13, 2008, 2:55:13 PM (15 years ago)

Author:

landauf

Message:

• deatheffect (explosion) of Pawns works on client and server (creator of the effects can't be the Pawn itself because it will be destroyed on the client before synchronizing the effects)
• fixed a small initialization error in Shader
• fixed a bug in the resynchronization of already deleted MovableEntities
• ExplosionChunk only recalculates it's velocity on the Master

File:

• code/branches/objecthierarchy2/src/network/Synchronisable.cc (modified) (2 diffs)

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

@@ -85 +85 @@
     for(it = ObjectList<Synchronisable>::begin(); it!=ObjectList<Synchronisable>::end(); ++it){
       if( it->getObjectID()==this->objectID )
-        assert(*it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0));
+        if(!(*it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0)))
+        {
+            COUT(1) << "Assertion failed: *it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0)" << std::endl;
+            COUT(1) << "Possible reason for this error: Client created a synchronized object without the Server's approval." << std::endl;
+            abort();
+        }
     }
 #endif
@@ -177 +182 @@
 
     Identifier* id = ClassByID(header->classID);
+    if (!id)
+    {
+        COUT(1) << "Assertion failed: id" << std::endl;
+        COUT(1) << "Possible reason for this error: Client received a synchronizable object whose class has no factory." << std::endl;
+        abort();
+    }
     assert(id);
     BaseObject* creator = 0;