Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4689 in orxonox.OLD for orxonox/trunk/src/world_entities


Ignore:
Timestamp:
Jun 24, 2005, 3:06:04 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: enhanced world entities to support collisions

Location:
orxonox/trunk/src/world_entities
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/world_entities/world_entity.cc

    r4684 r4689  
    130130   Implement behaviour like damage application or other miscellaneous collision stuff in this function
    131131*/
    132 void WorldEntity::collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags) {}
     132void WorldEntity::collideWith(WorldEntity* entity) {}
    133133
    134134

  • orxonox/trunk/src/world_entities/world_entity.h

    r4684 r4689  
    4747
    4848  virtual void hit (WorldEntity* weapon, Vector* loc);
    49   virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
     49  virtual void collideWith (WorldEntity* entity);
    5050  virtual void command (Command* cmd);
    5151
Note: See TracChangeset for help on using the changeset viewer.