Changeset 4973 in orxonox.OLD

Timestamp:

Aug 7, 2005, 10:54:07 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some more loadparams

Location:

orxonox/trunk/src/world_entities/weapons

Files:

• turret.cc (modified) (3 diffs)
• turret.h (modified) (1 diff)

orxonox/trunk/src/world_entities/weapons/turret.cc

@@ -28 +28 @@
 #include "fast_factory.h"
 
+CREATE_FACTORY(Turret);
 
 using namespace std;
@@ -40 +41 @@
   : Weapon(weaponManager)
 {
-  this->setClassID(CL_TURRET, "Turret");
+  this->init();
 
   this->loadModel("models/turret1.obj");
+
+
+  this->setActionSound(WA_SHOOT, "sound/shot1.wav");
+  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
+  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
+}
+
+
+Turret::Turret(const TiXmlElement* root)
+{
+  this->init();
+  this->loadParams(root);
+}
+
+/**
+ *  standard deconstructor
+*/
+Turret::~Turret ()
+{
+  // model will be deleted from WorldEntity-destructor
+}
+
+void Turret::init()
+{
+  this->setClassID(CL_TURRET, "Turret");
 
   Animation3D* animation1 = this->getAnimation(WS_ACTIVATING, this);
@@ -64 +90 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/shot1.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
-  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
 
   this->setProjectile(CL_TEST_BULLET);
 
+
   this->setEmissionPoint(1.684, 0.472, 0);
   //this->getProjectileFactory()->prepare(100);
+
+
 }
 
+void Turret::loadParams(const TiXmlElement* root)
+{
+  static_cast<Weapon*>(this)->loadParams(root);
 
-/**
- *  standard deconstructor
-*/
-Turret::~Turret ()
-{
-  // model will be deleted from WorldEntity-destructor
 }
 

orxonox/trunk/src/world_entities/weapons/turret.h

@@ -13 +13 @@
   public:
     Turret (WeaponManager* weaponManager);
+    Turret(const TiXmlElement* root);
     virtual ~Turret ();
+
+    void init();
+    void loadParams(const TiXmlElement* root);
 
     virtual void activate();