Changeset 1961 for code/branches/objecthierarchy/src/orxonox/objects/Trigger.h

Timestamp:

Oct 20, 2008, 12:04:03 AM (16 years ago)

Author:

rgrieder

Message:

updated msvc files and adjusted merged files.

File:

• code/branches/objecthierarchy/src/orxonox/objects/Trigger.h (modified) (2 diffs)

code/branches/objecthierarchy/src/orxonox/objects/Trigger.h

@@ -35 +35 @@
 #include "OrxonoxPrereqs.h"
 
-#include "WorldEntity.h"
+#include "worldentities/PositionableEntity.h"
 
 #include "../tools/BillboardSet.h"
@@ -48 +48 @@
   };
 
-  class _OrxonoxExport Trigger : public WorldEntity
+  class _OrxonoxExport Trigger : public PositionableEntity
   {
     public: