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

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.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc) (8 diffs, 1 prop)

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

@@ -1 +1 @@
 #include "PickupSpawner.h"
-#include "Item.h"
+#include "BaseItem.h"
 #include "objects/worldentities/pawns/Pawn.h"
 #include "objects/worldentities/triggers/DistanceTrigger.h"
@@ -11 +11 @@
 CreateFactory(PickupSpawner);
 
-PickupSpawner::PickupSpawner(BaseObject* creator) : PositionableEntity(creator)
+PickupSpawner::PickupSpawner(BaseObject* creator) : StaticEntity(creator)
 {
         RegisterObject(PickupSpawner);
@@ -31 +31 @@
         XMLPortParam(PickupSpawner, "distance", setDistance, getDistance, xmlelement, mode).defaultValues(20.0f);
         XMLPortParam(PickupSpawner, "respawntimer", setRespawnTimer, getRespawnTimer, xmlelement, mode);
-        
+
 }
 
@@ -58 +58 @@
         {
                 COUT(0) << "ITEM PICKED UP" << std::endl;
-                //if(player->isA(itemtemplate_->getPlayerBaseClass())) 
+                //if(player->isA(itemtemplate_->getPlayerBaseClass()))
                 {
                 BaseObject* newobject = this->template_->getBaseclassIdentifier()->fabricate(this);
-                Item* newitem = dynamic_cast<Item*>(newobject);
+                BaseItem* newitem = dynamic_cast<BaseItem*>(newobject);
                 if (newitem)
                 {
@@ -71 +71 @@
                                 this->setActive(false);
                                 this->fireEvent();
-                        }       
+                        }
                         else
                                 delete newobject;
@@ -82 +82 @@
 
 void PickupSpawner::triggerRespawnTimer()
-{       
-        
+{
+
         if(respawntimer_!=0)
         {
@@ -90 +90 @@
                 RespawnTimer_.setTimer(this->respawntimer_, false, (BaseObject*)this, executor);
                 COUT(0) << "TIMER SET" << std::endl;
-        }       
+        }
 }
 void PickupSpawner::changedActivity()
@@ -106 +106 @@
                 COUT(0) << "INvisble!" << std::endl;
         }
-                
+
 */
         SUPER(PickupSpawner, changedActivity);