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

trunk/src/world_entities/weapons/crosshair.cc

@@ -26 +26 @@
 
 
-
+ObjectListDefinition(Crosshair);
 /**
  * standart constructor
@@ -54 +54 @@
 void Crosshair::init()
 {
-  this->setClassID(CL_CROSSHAIR, "Crosshair");
+  this->registerObject(this, Crosshair::_objectList);
   this->setName("Crosshair");