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

trunk/src/story_entities/movie_loader.cc

@@ -25 +25 @@
 
 
-
-CREATE_FACTORY(MovieLoader, CL_MOVIE_LOADER);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(MovieLoader, CL_MOVIE_LOADER);
+CREATE_FACTORY(MovieLoader);
 
 MovieLoader::MovieLoader(const TiXmlElement* root)
 {
-  this->setClassID(CL_MOVIE_LOADER, "MovieLoader");
+  this->registerObject(this, MovieLoader::_objectList);
 
   movie_player = new MoviePlayer();