Changeset 9869 in orxonox.OLD for trunk/src/world_entities/npcs/ground_turret.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 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/ground_turret.cc (modified) (2 diffs)

trunk/src/world_entities/npcs/ground_turret.cc

@@ -29 +29 @@
 #include "effects/explosion.h"
 
-CREATE_FACTORY(GroundTurret, CL_GROUND_TURRET);
+#include "class_id_DEPRECATED.h"
 
-
+ObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);
+CREATE_FACTORY(GroundTurret);
 
 
@@ -61 +62 @@
 void GroundTurret::init()
 {
-  this->setClassID(CL_GROUND_TURRET, "GroundTurret");
+  this->registerObject(this, GroundTurret::_objectList);
   this->loadModel("models/ground_turret_#.obj", 5);
   this->left = NULL;