Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/recorder.cc

    r9406 r9869  
    1818#include "util/loading/load_param.h"
    1919#include "util/loading/factory.h"
    20 #include "util/loading/resource_manager.h"
    2120#include "state.h"
    22 
    23 
    24 
    25 CREATE_FACTORY(Recorder, CL_RECORDER);
     21#include "debug.h"
     22
     23#include "class_id_DEPRECATED.h"
     24ObjectListDefinitionID(Recorder, CL_RECORDER);
     25CREATE_FACTORY(Recorder);
    2626
    2727
    2828Recorder::Recorder (const TiXmlElement* root)
    2929{
    30   this->setClassID(CL_RECORDER, "Recorder");
     30  this->registerObject(this, Recorder::_objectList);
    3131
    3232  // initialize libavcodec, and register all codecs and formats
Note: See TracChangeset for help on using the changeset viewer.