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

trunk/src/world_entities/movie_entity.cc

@@ -21 +21 @@
 
 
-
-CREATE_FACTORY(MovieEntity, CL_MOVIE_ENTITY);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(MovieEntity, CL_MOVIE_ENTITY);
+CREATE_FACTORY(MovieEntity);
 
 /**
@@ -29 +30 @@
 MovieEntity::MovieEntity (const TiXmlElement* root)
 {
-  this->setClassID(CL_MOVIE_ENTITY, "MovieEntity");
+  this->registerObject(this, MovieEntity::_objectList);
 
   media_container = new MediaContainer();