Changeset 9869 in orxonox.OLD for trunk/src/world_entities/bsp_entity.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/bsp_entity.h (modified) (3 diffs)

trunk/src/world_entities/bsp_entity.h

@@ -18 +18 @@
 class BspEntity : public WorldEntity
 {
-
+  ObjectListDeclaration(BspEntity);
  public:
   BspEntity(const TiXmlElement* root = NULL);
@@ -28 +28 @@
 
   void init();
-  
+
   virtual void varChangeHandler( std::list<int> & id );
 
@@ -40 +40 @@
  private:
    BspManager* bspManager;
-   
+
    std::string name;                   //!< store name
    std::string name_write;             //!< temp variable to store name