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

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 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/extendable.h (modified) (2 diffs)

trunk/src/world_entities/extendable.h

@@ -1 +1 @@
 /*!
- * @file proto_class.h
- * @brief Interface for Worldentities that can picku up powerups.
+ * @file extendable.h
+ * @brief Interface for Worldentities that can pick up powerups.
 */
 
@@ -12 +12 @@
 class PowerUp;
 
+
 #include "power_ups/power_up.h"
-
-//! A class for ...
+//! A class for Extendable Entities
 class Extendable : virtual public BaseObject {
+  ObjectListDeclaration(Extendable);
 
   public:
-   //   virtual ~Extendable();
    virtual bool pickup(PowerUp* powerUp) { return false; };
 
   protected:
-    Extendable() { this->setClassID(CL_EXTENDABLE, "Extendable"); };
-
-  private:
-
+    Extendable() { this->registerObject(this, Extendable::_objectList); };
 };