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

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -25 +25 @@
 #include "util/loading/factory.h"
 #include "util/loading/load_param.h"
+#include "debug.h"
 
-
-
-CREATE_FACTORY(WeaponPowerUp, CL_WEAPON_POWER_UP);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(WeaponPowerUp, CL_WEAPON_POWER_UP);
+CREATE_FACTORY(WeaponPowerUp);
 
 WeaponPowerUp::WeaponPowerUp(const TiXmlElement* root) : PowerUp(1.0, 1.0, 0.0)
@@ -45 +46 @@
 void WeaponPowerUp::init()
 {
-  this->setClassID(CL_WEAPON_POWER_UP, "WeaponPowerUp");
+  this->registerObject(this, WeaponPowerUp::_objectList);
   this->loadPickupSound("sound/powerups/whats this2.wav");
 
@@ -87 +88 @@
 {
   this->weapon = dynamic_cast<Weapon*>((weaponXML == NULL)
-      ? Factory::fabricate(static_cast<ClassID>(this->weapon->getLeafClassID()))
+      ? Factory::fabricate((this->weapon->getClassID()))
       : Factory::fabricate((const TiXmlElement*)this->getXmlElem()->FirstChildElement("weapon")));
   this->model = this->weapon->getModel(0);