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

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/weapon_manager.cc (modified) (10 diffs)

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -17 +17 @@
 */
 
-#define DEBUG_SPECIAL_MODULE 4 //DEBUG_MODULE_WEAPON
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
 #include "weapon_manager.h"
 #include "weapon.h"
 #include "crosshair.h"
-#include "class_list.h"
 
 #include "playable.h"
 
-#include "util/loading/load_param.h"
+#include "util/loading/load_param_xml.h"
 #include "util/loading/factory.h"
 
@@ -32 +31 @@
 
 
+ObjectListDefinition(WeaponManager);
 /**
  * @brief this initializes the weaponManager for a given nnumber of weapon slots
@@ -57 +57 @@
   // crosshair being a PNode it must not be deleted (this is because PNodes delete themselves.)
   // rennerc: crosshair seems not to delete itselve
-  if (ClassList::exists(this->crosshair, CL_CROSSHAIR))
-    delete this->crosshair;
+  //if (Crosshair::objectList().exists(this->crosshair))
+  //  delete this->crosshair;
 }
 
@@ -66 +66 @@
 void WeaponManager::init()
 {
-  this->setClassID(CL_WEAPON_MANAGER, "WeaponManager");
+  this->registerObject(this, WeaponManager::_objectList);
 
   this->parentNode = NULL;
@@ -298 +298 @@
   {
     this->parentNode->addChild(weapon);
-    if (this->parentEntity->isA(CL_PLAYABLE))
+    if (this->parentEntity->isA(Playable::staticClassID()))
       dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
     weapon->setDefaultTarget(this->crosshair);
   }
-  PRINTF(3)("Added a new Weapon (%s::%s) to the WeaponManager: config %i/ slot %i\n", weapon->getClassCName(), weapon->getCName(), configID, slotID);
+  PRINTF(4)("Added a new Weapon (%s::%s) to the WeaponManager: config %i/ slot %i\n", weapon->getClassCName(), weapon->getCName(), configID, slotID);
   return true;
 }
@@ -311 +311 @@
  * @param ammo the ammo to increase
  */
-float WeaponManager::increaseAmmunition(ClassID projectileType, float ammo)
+float WeaponManager::increaseAmmunition(const ClassID& projectileType, float ammo)
 {
   return this->getAmmoContainer(projectileType)->increaseEnergy(ammo);
@@ -324 +324 @@
 {
   assert (weapon != NULL);
-  return this->increaseAmmunition(weapon->getLeafClassID(), ammo);
+  return this->increaseAmmunition(weapon->getClassID(), ammo);
 
 }
@@ -468 +468 @@
       else
         this->currentSlotConfig[i].position.deactivateNode();
-      if (this->parentEntity != NULL && this->parentEntity->isA(CL_PLAYABLE))
+      if (this->parentEntity != NULL && this->parentEntity->isA(Playable::staticClassID()))
         dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
     }
@@ -523 +523 @@
 }
 
-CountPointer<AmmoContainer>& WeaponManager::getAmmoContainer(ClassID projectileType)
+CountPointer<AmmoContainer>& WeaponManager::getAmmoContainer(const ClassID& projectileType)
 {
   for (unsigned int i = 0; i < this->ammo.size(); i++)
@@ -537 +537 @@
 {
   assert (weapon != NULL);
-  return (this->getAmmoContainer(weapon->getLeafClassID()));
+  return (this->getAmmoContainer(weapon->getClassID()));
 }