Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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.cc

    r7954 r8037  
    270270}
    271271
    272 
     272void WorldEntity::toReflectionList()
     273{
     274  State::getObjectManager()->toReflectionList( this );
     275}
     276
     277void removeFromReflectionList()
     278{
     279/// TODO
     280///  State::getObject
     281}
    273282
    274283/**
Note: See TracChangeset for help on using the changeset viewer.