Changeset 9869 in orxonox.OLD for trunk/src/world_entities/space_ships/cruizer.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/space_ships/cruizer.cc (modified) (2 diffs)

trunk/src/world_entities/space_ships/cruizer.cc

@@ -29 +29 @@
 
 #include "graphics_engine.h"
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include "debug.h"
 
-CREATE_FACTORY(Cruizer, CL_CRUIZER);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(Cruizer, CL_CRUIZER);
+CREATE_FACTORY(Cruizer);
 
 /**
@@ -89 +91 @@
 {
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
-  this->setClassID(CL_CRUIZER, "Cruizer");
+  this->registerObject(this, Cruizer::_objectList);
 
   this->setSupportedPlaymodes(Playable::Full3D);