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

trunk/src/world_entities/satellite.cc

@@ -21 +21 @@
 
 #include "objModel.h"
-#include "vector.h"
 
 
 
+
+ObjectListDefinition(Satellite);
 
 /**
@@ -31 +32 @@
 Satellite::Satellite (Vector axis, float speed)
 {
-  this->setClassID(CL_SATELLITE, "Satellite");
+  this->registerObject(this, Satellite::_objectList);
 
   this->loadModel("cube");