Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8037 in orxonox.OLD for trunk/src/world_entities/world_entity.h


Ignore:
Timestamp:
May 31, 2006, 4:52:34 PM (18 years ago)
Author:
bensch
Message:

trunk: merged the water back
merged with command
svn merge -r7798:HEAD https://svn.orxonox.net/orxonox/branches/water .

conflicts are all resolved

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/world_entity.h

    r7954 r8037  
    8080  /* --- Object Manager Block --- */
    8181  void toList(OM_LIST list);
     82
     83  void toReflectionList();
     84  void removeFromReflectionList();
     85
    8286  /** @returns a Reference to the objectListNumber to set. */
    8387  OM_LIST& getOMListNumber() { return this->objectListNumber; }
Note: See TracChangeset for help on using the changeset viewer.