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

trunk/src/story_entities/campaign_data.cc

@@ -18 +18 @@
 
 #include "util/loading/factory.h"
-#include "util/loading/load_param.h"
+#include "util/loading/load_param_xml.h"
 
 #include "story_entity.h"
 
+#include "debug.h"
 
 
 
+ObjectListDefinition(CampaignData);
 
 /**
@@ -31 +33 @@
 CampaignData::CampaignData(const TiXmlElement* root)
 {
-  this->setClassID(CL_CAMPAIGN_DATA, "CampaignData");
+  this->registerObject(this, CampaignData::_objectList);
 
   this->currentEntity = NULL;