Changeset 5982 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Dec 8, 2005, 12:22:53 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Factory-Redesign on the wish of manuel

Location:

trunk/src/world_entities/weapons

Files:

• ground_turret.cc (modified) (2 diffs)
• weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/weapons/ground_turret.cc

@@ -85 +85 @@
   element = root->FirstChildElement("weapon-left");
   if (element != NULL) element = element->FirstChildElement();
-  this->left = dynamic_cast<Weapon*>( Factory::getFirst()->fabricate( element) );
+  this->left = dynamic_cast<Weapon*>( Factory::fabricate( element) );
   if (this->left)
   {
@@ -94 +94 @@
   element = root->FirstChildElement("weapon-right");
   if (element != NULL)  if (element != NULL) element = element->FirstChildElement();
-  this->right = dynamic_cast<Weapon*>( Factory::getFirst()->fabricate( element) );
+  this->right = dynamic_cast<Weapon*>( Factory::fabricate( element) );
   if (this->right)
   {

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -140 +140 @@
   LOAD_PARAM_START_CYCLE(root, element);
 
-  Weapon* newWeapon = dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(element));
+  Weapon* newWeapon = dynamic_cast<Weapon*>(Factory::fabricate(element));
   /// @todo implement this !!