Changeset 9869 in orxonox.OLD for trunk/src/story_entities/campaign.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 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.cc (modified) (2 diffs)

trunk/src/story_entities/campaign.cc

@@ -24 +24 @@
 
 #include "campaign_data.h"
+#include "debug.h"
 
 
 
+ObjectListDefinition(Campaign);
 
 /**
@@ -36 +38 @@
 Campaign::Campaign ( TiXmlElement* root)
 {
-  this->setClassID(CL_CAMPAIGN, "Campaign");
+  this->registerObject(this, Campaign::_objectList);
 
   PRINTF(4)("Loading Campaign...\n");