Changeset 4725 in orxonox.OLD for orxonox/trunk/src/util

Timestamp:

Jun 28, 2005, 8:51:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more load-params for Particles

Location:

orxonox/trunk/src/util/loading

Files:

• factory.cc (modified) (1 diff)
• load_param.h (modified) (2 diffs)

orxonox/trunk/src/util/loading/factory.cc

@@ -84 +84 @@
 void Factory::initialize()
 {
-  GameLoader* gl = GameLoader::getInstance();
-  gl->registerFactory( this);
+#ifdef IS_ORXONOX
+  GameLoader::getInstance()->registerFactory( this);
+#endif /* IS_ORXONOX */
 }
 

orxonox/trunk/src/util/loading/load_param.h

@@ -194 +194 @@
            void(T::*function)(type1##_TYPE, type2##_TYPE, type3##_TYPE, type4##_TYPE, type5##_TYPE), \
            bool multi = false, type1##_TYPE default1 = type1##_DEFAULT, type2##_TYPE default2 = type2##_DEFAULT, type3##_TYPE default3 = type3##_DEFAULT, \
-           type4##_TYPE default4 = type4, ##_DEFAULTtype5##_TYPE default5 = type5##_DEFAULT ) \
+           type4##_TYPE default4 = type4##_DEFAULT, type5##_TYPE default5 = type5##_DEFAULT ) \
   : BaseLoadParam(root, pt2Object, paramName, 5, multi, NULL, type1##_NAME, default1, type2##_NAME, default2, type3##_NAME, default3, \
                   type4##_NAME, default4, type5##_NAME, default5) \
@@ -343 +343 @@
   //! makes functions with four floats loadable
   LoadParam4(l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT);
+  //! makes functions with four floats loadable
+  LoadParam5(l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT);