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

Timestamp:

May 22, 2005, 3:19:57 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the levelLoader-branche back into the trunk, because it seems to be stable.
merged with command:
svn merge -r 4230:HEAD levelLoader ../trunk
no conflicts of any interesst

File:

• orxonox/trunk/src/story_entities/campaign.cc (modified) (2 diffs)

orxonox/trunk/src/story_entities/campaign.cc

@@ -27 +27 @@
 #include "list.h"
 
+#include "load_param.h"
+
 using namespace std;
 
@@ -35 +37 @@
   this->isInit = false;
 }
+
 Campaign::Campaign ( TiXmlElement* root) 
 {