Changeset 10645 in orxonox.OLD for branches/vs-enhencements/src/world_entities/weapons

Timestamp:

May 2, 2007, 11:48:16 PM (17 years ago)

Author:

nicolasc

Message:

minor cleanup

Location:

branches/vs-enhencements/src/world_entities/weapons

Files:

• heavy_blaster.cc (modified) (1 diff)
• light_blaster.cc (modified) (1 diff)
• rf_cannon.cc (modified) (5 diffs)
• weapon.cc (modified) (3 diffs)
• weapon.h (modified) (1 diff)

branches/vs-enhencements/src/world_entities/weapons/heavy_blaster.cc

@@ -98 +98 @@
 //  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->loadModel("models/guns/frag_cannon.obj", .4);
+  this->loadModel("models/guns/frag_cannon2.obj", .4);
 
 

branches/vs-enhencements/src/world_entities/weapons/light_blaster.cc

@@ -53 +53 @@
 {
 
-//   for (int i = 0; i < this->getBarrels(); i++)
-//   {
-//    //delete [] this->shootAnim[i];
-//    delete [] this->objComp[i];
-//   }
-//   delete [] this->emissionPoint;
-//    //delete [] this->shootAnim;
-//    delete [] this->objComp;
+  for (int i = 0; i < this->getBarrels(); i++)
+  {
+   //delete [] this->shootAnim[i];
+   delete [] this->objComp[i];
+  }
+  delete [] this->emissionPoint;
+   //delete [] this->shootAnim;
+   delete [] this->objComp;
 
 }

branches/vs-enhencements/src/world_entities/weapons/rf_cannon.cc

@@ -52 +52 @@
 RFCannon::~RFCannon()
 {
-//   for (int i = 0; i < this->getBarrels(); i++)
-//     delete [] this->objComp[i];
+  for (int i = 0; i < this->getBarrels(); i++)
+    delete [] this->objComp[i];
 
-//   delete [] this->emissionPoint;
-//   delete [] this->objComp;
+  delete [] this->emissionPoint;
+  delete [] this->objComp;
 }
 
@@ -67 +67 @@
 {
 
-  this->loadModel("models/guns/rf_cannon.obj", 0.3);
+  this->loadModel("models/guns/rf_cannon.obj", 0.2);
 
 
@@ -82 +82 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  this->setProjectileTypeC("LBolt");
+  this->setProjectileTypeC("PlasmaPulse");
   this->prepareProjectiles(100);
 
@@ -122 +122 @@
 void RFCannon::fire()
 {
-  for (int i = 0; i < this->getBarrels(); i++){
+//   for (int i = 0; i < this->getBarrels(); i++){
     Projectile* pj =  this->getProjectile();
     if (pj == NULL)
@@ -139 +139 @@
 
     this->activeBarrel = (this->activeBarrel + 1) % this->getBarrels();
-  }
+//   }
 }
 

branches/vs-enhencements/src/world_entities/weapons/weapon.cc

@@ -163 +163 @@
  * needed, if there are more than one barrel or segments
  */
+/*
 void Weapon::init2()
 {
@@ -182 +183 @@
     this->shootAnim[i] = new Animation3D* [this->segs];
   }
-}
+}*/
 
 /**
  * deconstructor for init2
  */
+/*
 void Weapon::deconstr()
 {
@@ -198 +200 @@
   delete this->emissionPoint;
   delete this->shootAnim;
-}
+}*/
 
 /**

branches/vs-enhencements/src/world_entities/weapons/weapon.h

@@ -181 +181 @@
     inline void setSegs(int segs) { this->segs = segs; };
 
-    inline Animation3D* getShootAnim(int barrel, int seg) { return this->shootAnim[barrel][seg]; };
-    inline void setShootAnim(int barrel, int seg, PNode* component) { this->shootAnim[barrel][seg] = this->getAnimation(barrel, seg, component); };
-
-    void init2();
+//     inline Animation3D* getShootAnim(int barrel, int seg) { return this->shootAnim[barrel][seg]; };
+//     inline void setShootAnim(int barrel, int seg, PNode* component) { this->shootAnim[barrel][seg] = this->getAnimation(barrel, seg, component); };
+
+//     void init2();
     void deconstr();