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

trunk/src/world_entities/creatures/md2_creature.cc

@@ -22 +22 @@
 #include "objModel.h"
 #include "md2/md2Model.h"
-#include "util/loading/resource_manager.h"
 #include "state.h"
 
@@ -37 +36 @@
 #include "debug.h"
 
-CREATE_FACTORY(MD2Creature, CL_MD2_CREATURE);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(MD2Creature, CL_MD2_CREATURE);
+CREATE_FACTORY(MD2Creature);
 
 /**
@@ -86 +87 @@
   PRINTF(4)("MD2CREATURE INIT\n");
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
-  this->setClassID(CL_MD2_CREATURE, "MD2Creature");
+  this->registerObject(this, MD2Creature::_objectList);
 
   this->toList(OM_GROUP_01);
@@ -95 +96 @@
   Weapon* wpLeft = new TestGun(1);
   wpLeft->setName("testGun Left");
-  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON));
+  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate("Cannon"));
 
   cannon->setName("BFG");
@@ -112 +113 @@
   this->cameraConnNode.addChild(State::getCameraNode());
   State::getCameraTargetNode()->setRelCoor(10,0,0);
- 
+