Changeset 6340 in orxonox.OLD for branches/network_merged/src/world_entities/npcs/npc.h

Timestamp:

Dec 30, 2005, 1:52:26 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/newtork: merged the network branche for merging to the trunk
confilcts maily resolved in favor of trunk with some minor fixes

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6146:HEAD

File:

• branches/network_merged/src/world_entities/npcs/npc.h (modified) (1 diff)

branches/network_merged/src/world_entities/npcs/npc.h

@@ -8 +8 @@
 class AI;
 
-class NPC : public WorldEntity, public PhysicsInterface {
+class NPC : public WorldEntity {
 
  public: