Changeset 9869 in orxonox.OLD for trunk/src/world_entities/npcs/npc.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/npcs/npc.cc (modified) (1 diff)

trunk/src/world_entities/npcs/npc.cc

@@ -20 +20 @@
 #include "npc.h"
 
+ObjectListDefinition(NPC);
 
 NPC::NPC(const TiXmlElement* root)
 {
-  this->setClassID(CL_NPC, "NPC");
+  this->registerObject(this, NPC::_objectList);
 
   this->toList(OM_GROUP_00);