Changeset 9705 in orxonox.OLD for branches/new_class_id/src/world_entities/weapons/weapon.cc

Timestamp:

Aug 25, 2006, 9:44:53 PM (18 years ago)

Author:

bensch

Message:

adapted many more classes

File:

• branches/new_class_id/src/world_entities/weapons/weapon.cc (modified) (8 diffs)

branches/new_class_id/src/world_entities/weapons/weapon.cc

@@ -25 +25 @@
 
 #include "util/loading/resource_manager.h"
-#include "class_list.h"
 #include "util/loading/factory.h"
 #include "util/loading/load_param.h"
@@ -36 +35 @@
 #include "elements/glgui_energywidget.h"
 
-
+NewObjectListDefinition(Weapon);
 
 ////////////////////
@@ -58 +57 @@
 {
   for (int i = 0; i < WS_STATE_COUNT; i++)
-    if (this->animation[i] && ClassList::exists(animation[i], CL_ANIMATION))  //!< @todo this should check animation3D
+    if (this->animation[i] && Animation::objectList().exists(animation[i]))  //!< @todo this should check animation3D
       delete this->animation[i];
   for (int i = 0; i < WA_ACTION_COUNT; i++)
-    if (this->soundBuffers[i] != NULL && ClassList::exists(this->soundBuffers[i], CL_SOUND_BUFFER))
+    if (this->soundBuffers[i] != NULL && OrxSound::SoundBuffer::objectList().exists(this->soundBuffers[i]))
       ResourceManager::getInstance()->unload(this->soundBuffers[i]);
 
-  if (ClassList::exists(this->soundSource, CL_SOUND_SOURCE))
+  if (OrxSound::SoundSource::objectList().exists(this->soundSource))
     delete this->soundSource;
 }
@@ -73 +72 @@
  * @returns the newly created Weapon.
  */
-Weapon* Weapon::createWeapon(ClassID weaponID)
+Weapon* Weapon::createWeapon(const NewClassID& weaponID)
 {
   BaseObject* createdObject = Factory::fabricate(weaponID);
   if (createdObject != NULL)
   {
-    if (createdObject->isA(CL_WEAPON))
+    if (createdObject->isA(Weapon::classID()))
       return dynamic_cast<Weapon*>(createdObject);
     else
@@ -89 +88 @@
 }
 
+Weapon* Weapon::createWeapon(const std::string& weaponName)
+{
+  BaseObject* createdObject = Factory::fabricate(weaponName);
+  if (createdObject != NULL)
+  {
+    if (createdObject->isA(Weapon::classID()))
+      return dynamic_cast<Weapon*>(createdObject);
+    else
+    {
+      delete createdObject;
+      return NULL;
+    }
+  }
+  return NULL;
+}
+
+
 /**
  * initializes the Weapon with ALL default values
@@ -96 +112 @@
 void Weapon::init()
 {
-  this->setClassID(CL_WEAPON, "Weapon");
+  this->registerObject(this, Weapon::_objectList);
   this->currentState     = WS_INACTIVE;            //< Normaly the Weapon is Inactive
   this->requestedAction  = WA_NONE;                //< No action is requested by default
@@ -115 +131 @@
   this->defaultTarget = NULL;                      //< Nothing is Targeted by default.
 
-  this->projectile = CL_NULL;                      //< No Projectile Class is Connected to this weapon
+  this->projectile = NullClass::classID();         //< No Projectile Class is Connected to this weapon
   this->projectileFactory = NULL;                  //< No Factory generating Projectiles is selected.
 
@@ -163 +179 @@
  * What it does, is telling the Weapon what Projectiles it can Emit.
  */
-void Weapon::setProjectileType(ClassID projectile)
-{
-  if (projectile == CL_NULL)
-    return;
+void Weapon::setProjectileType(const NewClassID& projectile)
+{
   this->projectile = projectile;
   this->projectileFactory = FastFactory::searchFastFactory(projectile);