Changeset 9869 in orxonox.OLD for trunk/src/util/game_rules.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/util/game_rules.cc (modified) (3 diffs)

trunk/src/util/game_rules.cc

@@ -17 +17 @@
 #include "game_rules.h"
 
-#include "util/loading/load_param.h"
+#include "util/loading/load_param_xml.h"
 #include "util/loading/factory.h"
 
@@ -28 +28 @@
 
 
-
+ObjectListDefinition(GameRules);
 
 /**
@@ -35 +35 @@
 GameRules::GameRules(const TiXmlElement* root)
 {
-  this->setClassID(CL_GAME_RULES, "GameRules");
+  this->registerObject(this, GameRules::_objectList);
 }