[Orxonox-commit 7290] r11907 - in code/branches/Masterserver_FS18/src/libraries/network: packet synchronisable

[mdedial at orxonox.net]

Author: mdedial
Date: 2018-04-26 15:21:23 +0200 (Thu, 26 Apr 2018)
New Revision: 11907

Modified:
   code/branches/Masterserver_FS18/src/libraries/network/packet/Gamestate.cc
   code/branches/Masterserver_FS18/src/libraries/network/synchronisable/Synchronisable.cc
Log:
Remove flawed sanity check creating false error messages.


Modified: code/branches/Masterserver_FS18/src/libraries/network/packet/Gamestate.cc
===================================================================
--- code/branches/Masterserver_FS18/src/libraries/network/packet/Gamestate.cc	2018-04-26 12:45:47 UTC (rev 11906)
+++ code/branches/Masterserver_FS18/src/libraries/network/packet/Gamestate.cc	2018-04-26 13:21:23 UTC (rev 11907)
@@ -206,40 +206,6 @@
     }
   }
   assert((uintptr_t)(mem-data_) == GamestateHeader::getSize()+header_.getDataSize());
-  
-   // In debug mode, check first, whether there are no duplicate objectIDs
-#ifndef NDEBUG
-  if(this->getID()%1000==1)
-  {
-    std::list<uint32_t> v1;
-    for (Synchronisable* synchronisable : ObjectList<Synchronisable>())
-    {
-      if (synchronisable->getObjectID() == OBJECTID_UNKNOWN)
-      {
-        if (synchronisable->objectMode_ != 0x0)
-        {
-          orxout(user_error, context::packets) << "Found object with OBJECTID_UNKNOWN on the client with objectMode != 0x0!" << endl;
-          orxout(user_error, context::packets) << "Possible reason for this error: Client created a synchronized object without the Server's approval." << endl;
-          orxout(user_error, context::packets) << "Objects class: " << synchronisable->getIdentifier()->getName() << endl;
-          //assert(false);
-        }
-      }
-      else
-      {
-        for (uint32_t id : v1)
-        {
-          if (synchronisable->getObjectID() == id)
-          {
-            orxout(user_error, context::packets) << "Found duplicate objectIDs on the client!" << endl
-                                                 << "Are you sure you don't create a Sychnronisable objcect with 'new' \
-                                                     that doesn't have objectMode = 0x0?" << endl;
-          }
-        }
-        v1.push_back(synchronisable->getObjectID());
-      }
-    }
-  }
-#endif
   return true;
 }
 

Modified: code/branches/Masterserver_FS18/src/libraries/network/synchronisable/Synchronisable.cc
===================================================================
--- code/branches/Masterserver_FS18/src/libraries/network/synchronisable/Synchronisable.cc	2018-04-26 12:45:47 UTC (rev 11906)
+++ code/branches/Masterserver_FS18/src/libraries/network/synchronisable/Synchronisable.cc	2018-04-26 13:21:23 UTC (rev 11907)
@@ -52,7 +52,7 @@
   */
   Synchronisable::Synchronisable(Context* context)
   {
-      RegisterObject(Synchronisable);
+    RegisterObject(Synchronisable);
     static uint32_t idCounter=0;
     objectMode_=0x1; // by default do not send data to server
     if ( GameMode::isMaster()/* || ( Host::running() && Host::isServer() )*/ )