Changeset 9869 in orxonox.OLD for trunk/src/world_entities/weapons/ammo_container.cc

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/weapons/ammo_container.cc (modified) (1 diff)

trunk/src/world_entities/weapons/ammo_container.cc

@@ -23 +23 @@
 
 
-
+ObjectListDefinition(AmmoContainer);
 /**
  * standard constructor
  * @todo this constructor is not jet implemented - do it
 */
-AmmoContainer::AmmoContainer (ClassID projectileType, float maxEnergy)
+AmmoContainer::AmmoContainer (const ClassID& projectileType, float maxEnergy)
 {
-   this->setClassID(CL_AMMO_CONTAINER, "AmmoContainer");
+  this->registerObject(this, AmmoContainer::_objectList);
 
-   this->projectileType = projectileType;
-   this->maxEnergy = maxEnergy;
+  this->projectileType = projectileType;
+  this->maxEnergy = maxEnergy;
 
-   this->energy = 0.0;
+  this->energy = 0.0;
 }