Changeset 9869 in orxonox.OLD for trunk/src/world_entities/weapons/ammo_container.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/weapons/ammo_container.h (modified) (1 diff)

trunk/src/world_entities/weapons/ammo_container.h

@@ -17 +17 @@
 //! A class for Storing energy of Projectiles.
 class AmmoContainer : public BaseObject {
+  ObjectListDeclaration(AmmoContainer);
 
  public:
-  AmmoContainer(ClassID projectileType, float maxEnergy = DEFAULT_MAX_ENERGY);
+  AmmoContainer(const ClassID& id, float maxEnergy = DEFAULT_MAX_ENERGY);
   virtual ~AmmoContainer();
 
-  bool operator=(ClassID projectileType) const { return (this->projectileType == projectileType); };
+  bool operator=(int projectileType) const { return (this->projectileType == projectileType); };
   ClassID getProjectileType() const { return this->projectileType; };