Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9908 in orxonox.OLD for branches


Ignore:
Timestamp:
Oct 29, 2006, 11:41:56 AM (18 years ago)
Author:
rennerc
Message:

BaseObject: removed LeafClassID since it is not used any more

Location:
branches/network/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/network/src/lib/lang/base_object.h

    r9902 r9908  
    5151  /** @returns the ClassID of this Object */
    5252  inline const ClassID& getClassID() const { return _classes.front()._objectList->identity(); }
    53   /** @returns the ID of the Topmost object of the ClassStack. */
    54   inline const ClassID& getLeafClassID() const { return leafClassID; }
    5553
    5654  bool isA(const ObjectListBase& objectList) const;
     
    7169protected:
    7270  std::string        objectName;       //!< The name of this object
    73   ClassID            leafClassID;      //!< classId of leaf class
    7471
    7572private:
     
    108105{
    109106  this->_classes.push_front(ClassEntry(&objectList, objectList.registerObject(object)));
    110   this->leafClassID = objectList.identity();
    111107}
    112108
  • branches/network/src/lib/network/network_stream.cc

    r9907 r9908  
    966966
    967967      // if handshake not finished only sync handshake
    968       if ( peer->second.handshake && Handshake::staticClassID() != sync.getLeafClassID())
     968      if ( peer->second.handshake && Handshake::staticClassID() != sync.getClassID() )
    969969        continue;
    970970
     
    972972      if ( ( SharedNetworkData::getInstance()->isMasterServer() ||
    973973             SharedNetworkData::getInstance()->isProxyServerActive() &&  peer->second.isClient())
    974              && Handshake::staticClassID() == sync.getLeafClassID() && sync.getUniqueID() != peer->second.userId )
     974             && Handshake::staticClassID() == sync.getClassID() && sync.getUniqueID() != peer->second.userId )
    975975        continue;
    976976
    977977      /* list of synchronizeables that will never be synchronized over the network: */
    978978      // do not sync null parent
    979       if ( NullParent::staticClassID() == sync.getLeafClassID())
     979      if ( NullParent::staticClassID() == sync.getClassID())
    980980        continue;
    981981
    982982
    983       assert( sync.getLeafClassID() != 0);
     983      assert( sync.getClassID() != 0);
    984984
    985985      assert( offset + INTSIZE <= UDP_PACKET_SIZE );
  • branches/network/src/lib/network/synchronizeable_var/synchronizeable_classid.cc

    r9907 r9908  
    4646int SynchronizeableClassID::writeToBuf( byte * buf, int maxLength )
    4747{
    48   int res = Converter::intToByteArray( vPtrIn->getLeafClassID().id(), buf, maxLength );
     48  int res = Converter::intToByteArray( vPtrIn->getClassID().id(), buf, maxLength );
    4949
    5050  assert( res == INTSIZE );
  • branches/network/src/story_entities/multi_player_world_data.cc

    r9903 r9908  
    149149        BaseObject* created = Factory::fabricate(element);
    150150        if( created != NULL )
    151           PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), (int)created->getLeafClassID().id(), element->Value());
     151          PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), (int)created->getClassID().id(), element->Value());
    152152        else
    153153          PRINTF(1)("NetworkWorld: could not create this entity\n");
     
    180180
    181181          if( created != NULL )
    182             PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), created->getLeafClassID().id(), element->Value());
     182            PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), created->getClassID().id(), element->Value());
    183183          else
    184184            PRINTF(1)("NetworkWorld: could not create this entity\n");
Note: See TracChangeset for help on using the changeset viewer.