Changeset 10701 in orxonox.OLD

Timestamp:

Jun 14, 2007, 11:15:04 PM (17 years ago)

Author:

nicolasc

Message:

minor improvements, some cleanup

Location:

branches/presentation/src

Files:

• lib/lang/base_object.cc (modified) (2 diffs)
• world_entities/projectiles/acid_splash.cc (modified) (6 diffs)
• world_entities/weapons/rf_cannon.cc (modified) (2 diffs)

branches/presentation/src/lib/lang/base_object.cc

@@ -33 +33 @@
   this->xmlElem = NULL;
   this->registerObject(this, BaseObject::_objectList);
+
+  srand(time(0));   //initialize Random Nomber Generator
 }
 
@@ -45 +47 @@
   this->xmlElem = (bo.xmlElem)? bo.xmlElem->Clone() : NULL;
   this->registerObject( this, BaseObject::_objectList);
+
+  srand(time(0));   //initialize Random Nomber Generator
 }
 

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

@@ -22 +22 @@
 #include "state.h"
 
-//#include "space_ships/space_ship.h"
-
 #include <cassert>
 #include "debug.h"
-
-//#include "static_model.h"
 
 #include "effects/wobblegrid.h"
@@ -43 +39 @@
   this->registerObject(this, AcidSplash::_objectList);
 
-  srand(time(0));   //initialize Random Nomber Generator
-
-  //this->loadModel("models/projectiles/laser.obj");
+// moved to baseObject
+//   srand(time(0));   //initialize Random Nomber Generator
 
   this->setMinEnergy(1);
@@ -72 +67 @@
       this->grid->setTexture( "textures/acid2.png");
   }
-//   if (rand()/2 == 0) //!<Randomized Textrures
-//     this->grid->setTexture( "textures/acid3.png");
-//   else
-//     this->grid->setTexture( "textures/blub.png");
 
   this->grid->toList(OM_ENVIRON); 
@@ -87 +78 @@
 AcidSplash::~AcidSplash ()
 {
-  // delete this->emitter;
-  //delete this->grid;
   this->grid->toList(OM_DEAD);
-  
 }
 
@@ -121 +109 @@
 }
 
-/*
-void AcidSplash::collidesWith(WorldEntity* entity, const Vector& location)
-{
 
-  if (this->hitEntity != entity)
-    this->destroy( entity );
-  this->hitEntity = entity;
-  //dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
-  //this->destroy(this);
-  this->deactivate();
-  
-//   return;
-
-  //dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
-  //entity->destroy(this);
-  //this->deactivate();
-}
-*/
 /**
  *  signal tick, time dependent things will be handled here
@@ -145 +116 @@
 void AcidSplash::tick (float dt)
 {
-  //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
   Vector v = this->velocity * dt;
   this->shiftCoor(v);

branches/presentation/src/world_entities/weapons/rf_cannon.cc

@@ -69 +69 @@
 void RFCannon::init()
 {
-
   this->setScaling(.2);
 
@@ -92 +91 @@
   this->setBarrels(4);
   this->setSegs(1);
-  this->activeBarrel = 0;
+  this->activeBarrel = (rand() % 4);
 
   this->objComp = new PNode**[this->getBarrels()];