Changeset 2500 for code/branches/presentation/src/orxonox/objects/pickup/PickupSpawner.h

Timestamp:

Dec 17, 2008, 8:00:43 AM (15 years ago)

Author:

landauf

Message:

merged pickups2 to presentation

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/orxonox/objects/pickup/PickupSpawner.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h) (1 diff, 1 prop)

code/branches/presentation/src/orxonox/objects/pickup/PickupSpawner.h

@@ -3 +3 @@
 
 #include "OrxonoxPrereqs.h"
-#include "Item.h"
+#include "BaseItem.h"
 #include "tools/Timer.h"
-#include "objects/worldentities/PositionableEntity.h"
+#include "objects/worldentities/StaticEntity.h"
 #include "objects/Tickable.h"
 
 namespace orxonox
 {
-        class _OrxonoxExport PickupSpawner : public PositionableEntity, public Tickable
+        class _OrxonoxExport PickupSpawner : public StaticEntity, public Tickable
         {
         public: