Changeset 10333 in orxonox.OLD for branches/playability/src/world_entities/projectiles

Timestamp:

Jan 24, 2007, 3:29:46 PM (18 years ago)

Author:

nicolasc

Message:

bump: black acid splash

Location:

branches/playability/src/world_entities/projectiles

Files:

• acid_splash.cc (modified) (2 diffs)
• projectile_weapon.h (modified) (1 diff)
• spike.cc (modified) (1 diff)
• spike_ball.cc (modified) (4 diffs)
• spike_ball.h (modified) (1 diff)

branches/playability/src/world_entities/projectiles/acid_splash.cc

@@ -55 +55 @@
   this->grid->setParent( this);
 
-//  if (rand()/2 == 0) //!<Randomized Textrures
-    this->grid->setTexture( "maps/acid3.png");
+
+  int rnd = rand()/3;
+
+  switch (rnd){
+    case 0:
+      this->grid->setTexture( "maps/acid2.png");
+      break;
+    case 1:
+      this->grid->setTexture( "maps/acid3.png");
+      break;
+    case 2:
+      this->grid->setTexture( "maps/blub.png");
+      break;
+    default:
+      this->grid->setTexture( "maps/acid2.png");
+  }
+//   if (rand()/2 == 0) //!<Randomized Textrures
+//     this->grid->setTexture( "maps/acid3.png");
 //   else
 //     this->grid->setTexture( "maps/blub.png");
 
   this->grid->toList(OM_ENVIRON); //this->getOMListNumber());
-  //this->toList(OM_ENVIRON);
+  this->toList(OM_ENVIRON);
 }
 
@@ -113 +129 @@
   this->deactivate();
   
-  return;
+//   return;
 
   //dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());

branches/playability/src/world_entities/projectiles/projectile_weapon.h

@@ -116 +116 @@
 
 //     FastFactory             ff;
-    static FastFactory*               fastFactory;
+//     static FastFactory*               fastFactory;
 
     OrxSound::SoundSource  soundSource;

branches/playability/src/world_entities/projectiles/spike.cc

@@ -43 +43 @@
   this->registerObject(this, Spike::_objectList);
 
-  this->loadModel("models/projectiles/spike.obj");
+  this->loadModel("models/projectiles/spike.obj", 2);
 
   this->setMinEnergy(1);

branches/playability/src/world_entities/projectiles/spike_ball.cc

@@ -130 +130 @@
     this->launcher[tmp + i] =  this->launcher[i] * (-1);
   }
+
+  this->freeMode = false;
 }
 
@@ -157 +159 @@
 void SpikeBall::blow()
 {
-  updateFireDir();
+  if ( this->freeMode )
+    updateFireDir();
 
   Spike* pj = NULL;
@@ -258 +261 @@
   float matrix[4][4];
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+  this->halo->draw();
 
   glRotatef(angle, this->getRotationAxis().x, this->getRotationAxis().y, this->getRotationAxis().z);
@@ -264 +268 @@
   this->getModel()->draw();
 
-  this->halo->draw();
 
   glPopMatrix();

branches/playability/src/world_entities/projectiles/spike_ball.h

@@ -61 +61 @@
     float         size;
 
+    bool          freeMode;
+
 };