Changeset 10484 in orxonox.OLD for branches/playability/src/world_entities/weapons

Timestamp:

Jan 29, 2007, 5:07:24 PM (18 years ago)

Author:

nicolasc

Message:

tmp xfer

Location:

branches/playability/src/world_entities/weapons

Files:

• heavy_blaster.cc (modified) (3 diffs)
• light_blaster.cc (modified) (3 diffs)

branches/playability/src/world_entities/weapons/heavy_blaster.cc

@@ -72 +72 @@
 //  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->loadModel("models/guns/fragcannon.obj", .4);
+  this->loadModel("models/guns/frag_cannon.obj", .4);
 
 
@@ -85 +85 @@
 
   this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
+//   this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
   this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  this->setProjectileTypeC("HBolt");   // FIXME temp project type until the blaste class exist
-//   this->setProjectileTypeC("SpikeBall");   // FIXME temp project type until the blaste class exist
+  this->setProjectileTypeC("HBolt");
   this->prepareProjectiles(5);
 
@@ -96 +95 @@
   this->setSegs(2);
   this->activeBarrel = 0;
-//   this->init2();
 
 

branches/playability/src/world_entities/weapons/light_blaster.cc

@@ -43 +43 @@
    delete [] this->shootAnim;
    delete [] this->objComp;
-/*
-    for(int j = 0; j < this->getSegs(); j++)
-    {
-      delete this->shootAnim[i][j];
-      delete this->objComp[i][j];
-    }
-    delete this->shootAnim[i];
-    delete this->objComp[i];
-    delete this->emissionPoint[i];
-  }*/
 
-//  this->deconstr();
-      // model will be deleted from WorldEntity-destructor
 }
 
@@ -66 +54 @@
 {
 
-  this->loadModel("models/guns/gattling.obj", 0.333);
+  this->loadModel("models/guns/gatling.obj", 0.333);
 
 
@@ -79 +67 @@
 
   this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
+//   this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
   this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  //this->setProjectileTypeC("RailProjectile");   // FIXME temp project type until the blaste class exist
-  this->setProjectileTypeC("LBolt");   // Working; FIXME: add textures
-//   this->setProjectileTypeC("Spike");   // Working; FIXME: add textures
+  this->setProjectileTypeC("LBolt");
   this->prepareProjectiles(100);