Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9656 in orxonox.OLD for trunk/src/util/object_manager.h


Ignore:
Timestamp:
Aug 4, 2006, 11:01:28 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/util/object_manager.h

    r8068 r9656  
    9696
    9797  static OM_LIST StringToOMList(const std::string& listName);
    98   static const char* OMListToString(OM_LIST omList);
     98  static const std::string& OMListToString(OM_LIST omList);
    9999
    100100
    … …  
    113113  EntityList                              objectLists[OM_SIZE];     //!< The ObjectLists.
    114114
    115   static const char*                      objectManagerListNames[]; //!< Names of all the lists
     115  static const std::string                objectManagerListNames[]; //!< Names of all the lists
    116116
    117117  EntityList                              reflectionList;           //!< A list of all reflected objects in the world
Note: See TracChangeset for help on using the changeset viewer.