Changeset 9869 in orxonox.OLD for trunk/src/world_entities/power_ups/turret_power_up.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/power_ups/turret_power_up.h (modified) (2 diffs)

trunk/src/world_entities/power_ups/turret_power_up.h

@@ -13 +13 @@
 
 class TurretPowerUp : public PowerUp {
+  ObjectListDeclaration(TurretPowerUp);
 
  public:
@@ -20 +21 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  virtual void TurretPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
+  virtual void collidesWith(WorldEntity* entity, const Vector& location);
   virtual void tick(float dt);
   virtual void draw() const;