Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6341 in orxonox.OLD for trunk/src/world_entities/npcs


Ignore:
Timestamp:
Dec 30, 2005, 1:57:12 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the network branche back to the trunk, so we do not get away from each other to fast

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

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/npcs/npc.cc

    r6222 r6341  
    6262      this->collider = entity;
    6363  }
    64   else if (entity->isA(CL_PLAYER))
    65     this->applyForce(Vector(0,0,0)-location*100);
     64  //  else if (entity->isA(CL_PLAYER))
     65  //    this->applyForce(Vector(0,0,0)-location*100);
    6666  else if (entity->isA(CL_NPC))
    6767  {

  • trunk/src/world_entities/npcs/npc.h

    r6004 r6341  
    88class AI;
    99
    10 class NPC : public WorldEntity, public PhysicsInterface {
     10class NPC : public WorldEntity {
    1111
    1212 public:
Note: See TracChangeset for help on using the changeset viewer.