Changeset 9869 in orxonox.OLD for trunk/src/world_entities/projectiles/rail_projectile.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/projectiles/rail_projectile.cc (modified) (4 diffs)

trunk/src/world_entities/projectiles/rail_projectile.cc

@@ -19 +19 @@
 
 #include "state.h"
-#include "class_list.h"
 #include "model.h"
 
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include <cassert>
@@ -29 +28 @@
 
 
-
-CREATE_FAST_FACTORY_STATIC(RailProjectile, CL_RAIL_PROJECTILE);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(RailProjectile, CL_RAIL_PROJECTILE);
+CREATE_FAST_FACTORY_STATIC(RailProjectile);
 
 /**
@@ -37 +37 @@
 RailProjectile::RailProjectile () : Projectile()
 {
-  this->setClassID(CL_RAIL_PROJECTILE, "RailProjectile");
+  this->registerObject(this, RailProjectile::_objectList);
 
-  this->loadModel("models/projectiles/laser_projectile.obj", 100);
+  this->loadModel("models/projectiles/laser.obj", 1);
 
   this->setMinEnergy(10);
@@ -61 +61 @@
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (RailProjectile::explosionParticles != NULL && ClassList::getList(CL_RAIL_PROJECTILE)->size() <= 1)
+  if (RailProjectile::explosionParticles != NULL && RailProjectile::objectList().size() <= 1)
   {
     //if (ClassList::exists(RailProjectile::explosionParticles, CL_PARTICLE_SYSTEM))