Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jun 28, 2005, 8:51:49 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: more load-params for Particles

Location:
orxonox/trunk/src/util/loading
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/util/loading/factory.cc

    r4597 r4725  
    8484void Factory::initialize()
    8585{
    86   GameLoader* gl = GameLoader::getInstance();
    87   gl->registerFactory( this);
     86#ifdef IS_ORXONOX
     87  GameLoader::getInstance()->registerFactory( this);
     88#endif /* IS_ORXONOX */
    8889}
    8990
  • orxonox/trunk/src/util/loading/load_param.h

    r4625 r4725  
    194194           void(T::*function)(type1##_TYPE, type2##_TYPE, type3##_TYPE, type4##_TYPE, type5##_TYPE), \
    195195           bool multi = false, type1##_TYPE default1 = type1##_DEFAULT, type2##_TYPE default2 = type2##_DEFAULT, type3##_TYPE default3 = type3##_DEFAULT, \
    196            type4##_TYPE default4 = type4, ##_DEFAULTtype5##_TYPE default5 = type5##_DEFAULT ) \
     196           type4##_TYPE default4 = type4##_DEFAULT, type5##_TYPE default5 = type5##_DEFAULT ) \
    197197  : BaseLoadParam(root, pt2Object, paramName, 5, multi, NULL, type1##_NAME, default1, type2##_NAME, default2, type3##_NAME, default3, \
    198198                  type4##_NAME, default4, type5##_NAME, default5) \
     
    343343  //! makes functions with four floats loadable
    344344  LoadParam4(l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT);
     345  //! makes functions with four floats loadable
     346  LoadParam5(l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT);
    345347
    346348
Note: See TracChangeset for help on using the changeset viewer.