Changeset 9908 in orxonox.OLD

Timestamp:

Oct 29, 2006, 11:41:56 AM (17 years ago)

Author:

rennerc

Message:

BaseObject: removed LeafClassID since it is not used any more

Location:

branches/network/src

Files:

• lib/lang/base_object.h (modified) (3 diffs)
• lib/network/network_stream.cc (modified) (2 diffs)
• lib/network/synchronizeable_var/synchronizeable_classid.cc (modified) (1 diff)
• story_entities/multi_player_world_data.cc (modified) (2 diffs)

branches/network/src/lib/lang/base_object.h

@@ -51 +51 @@
   /** @returns the ClassID of this Object */
   inline const ClassID& getClassID() const { return _classes.front()._objectList->identity(); }
-  /** @returns the ID of the Topmost object of the ClassStack. */
-  inline const ClassID& getLeafClassID() const { return leafClassID; }
 
   bool isA(const ObjectListBase& objectList) const;
@@ -71 +69 @@
 protected:
   std::string        objectName;       //!< The name of this object
-  ClassID            leafClassID;      //!< classId of leaf class
 
 private:
@@ -108 +105 @@
 {
   this->_classes.push_front(ClassEntry(&objectList, objectList.registerObject(object)));
-  this->leafClassID = objectList.identity();
 }
 

branches/network/src/lib/network/network_stream.cc

@@ -966 +966 @@
 
       // if handshake not finished only sync handshake
-      if ( peer->second.handshake && Handshake::staticClassID() != sync.getLeafClassID())
+      if ( peer->second.handshake && Handshake::staticClassID() != sync.getClassID() )
         continue;
 
@@ -972 +972 @@
       if ( ( SharedNetworkData::getInstance()->isMasterServer() ||
              SharedNetworkData::getInstance()->isProxyServerActive() &&  peer->second.isClient())
-             && Handshake::staticClassID() == sync.getLeafClassID() && sync.getUniqueID() != peer->second.userId )
+             && Handshake::staticClassID() == sync.getClassID() && sync.getUniqueID() != peer->second.userId )
         continue;
 
       /* list of synchronizeables that will never be synchronized over the network: */
       // do not sync null parent
-      if ( NullParent::staticClassID() == sync.getLeafClassID())
+      if ( NullParent::staticClassID() == sync.getClassID())
         continue;
 
 
-      assert( sync.getLeafClassID() != 0);
+      assert( sync.getClassID() != 0);
 
       assert( offset + INTSIZE <= UDP_PACKET_SIZE );

branches/network/src/lib/network/synchronizeable_var/synchronizeable_classid.cc

@@ -46 +46 @@
 int SynchronizeableClassID::writeToBuf( byte * buf, int maxLength )
 {
-  int res = Converter::intToByteArray( vPtrIn->getLeafClassID().id(), buf, maxLength );
+  int res = Converter::intToByteArray( vPtrIn->getClassID().id(), buf, maxLength );
 
   assert( res == INTSIZE );

branches/network/src/story_entities/multi_player_world_data.cc

@@ -149 +149 @@
         BaseObject* created = Factory::fabricate(element);
         if( created != NULL )
-          PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), (int)created->getLeafClassID().id(), element->Value());
+          PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), (int)created->getClassID().id(), element->Value());
         else
           PRINTF(1)("NetworkWorld: could not create this entity\n");
@@ -180 +180 @@
 
           if( created != NULL )
-            PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), created->getLeafClassID().id(), element->Value());
+            PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), created->getClassID().id(), element->Value());
           else
             PRINTF(1)("NetworkWorld: could not create this entity\n");