Changeset 7954 in orxonox.OLD for trunk/src/lib/lang

Timestamp:

May 29, 2006, 3:28:41 PM (19 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk.

Location:

trunk/src/lib/lang

Files:

• base_object.cc (modified) (3 diffs)
• base_object.h (modified) (2 diffs)

trunk/src/lib/lang/base_object.cc

@@ -82 +82 @@
   assert (!(this->classID & classID & !CL_MASK_SUBSUPER_CLASS_IDA ));
 
+  this->leafClassID = classID;
   this->classID |= (long)classID;
   this->className = className;
@@ -105 +106 @@
  * Factory::fabricate(Object->getLeafClassID());
  */
-ClassID BaseObject::getLeafClassID() const
+const ClassID& BaseObject::getLeafClassID() const
 {
-  assert (this->classList != NULL);
-  return this->classList->getLeafClassID();
+  return this->leafClassID;
 }
 
@@ -176 +176 @@
 
 }
-
-/**
- * Writes data from network containing information about the state
- * @param data pointer to data
- * @param length length of data
- * @param sender hostID of sender
- */
-int BaseObject::writeState( const byte * data, int length, int sender )
-{
-  SYNCHELP_READ_BEGIN();
-
-  SYNCHELP_READ_STRING( this->objectName, NWT_BO_NAME );
-
-  return SYNCHELP_READ_N;
-}
-
-/**
- * data copied in data will bee sent to another host
- * @param data pointer to data
- * @param maxLength max length of data
- * @return the number of bytes writen
- */
-int BaseObject::readState( byte * data, int maxLength )
-{
-  SYNCHELP_WRITE_BEGIN();
-
-  //PRINTF(0)("objectname = %s\n", this->objectName);
-  SYNCHELP_WRITE_STRING( this->objectName, NWT_BO_NAME );
-
-  return SYNCHELP_WRITE_N;
-}

trunk/src/lib/lang/base_object.h

@@ -42 +42 @@
   /** @returns the classID of the corresponding Object */
   inline int getClassID() const { return this->classID; };
-  ClassID    getLeafClassID() const;
+  const ClassID& getLeafClassID() const;
 
   bool isA (ClassID classID) const;
@@ -52 +52 @@
   bool operator==(ClassID classID) { return this->isA(classID); };
 
-  int       writeState(const byte* data, int length, int sender);
-  int       readState(byte* data, int maxLength );
-
  protected:
    void setClassID(ClassID classID, const std::string& className);
+   std::string        objectName;        //!< The name of this object
 
  private:
     std::string        className;        //!< the name of the class
     long               classID;          //!< this is the id from the class_id.h enumeration
-    std::string        objectName;       //!< The name of this object
+    ClassID            leafClassID;      //!< The Leaf Class ID
 
     ClassList*         classList;        //!< Pointer to the ClassList this Object is inside of