[Orxonox-commit 4649] r9320 - in code/branches/presentation2012merge/src: libraries/core modules/pickup modules/pickup/items orxonox/interfaces
landauf at orxonox.net
landauf at orxonox.net
Sat Jul 21 15:51:06 CEST 2012
Author: landauf
Date: 2012-07-21 15:51:06 +0200 (Sat, 21 Jul 2012)
New Revision: 9320
Modified:
code/branches/presentation2012merge/src/libraries/core/Super.h
code/branches/presentation2012merge/src/modules/pickup/Pickup.cc
code/branches/presentation2012merge/src/modules/pickup/Pickup.h
code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc
code/branches/presentation2012merge/src/modules/pickup/PickupCollection.h
code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h
code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.h
code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.h
code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.h
code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.h
code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.h
code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.h
code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h
code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc
code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.h
Log:
removed Pickupable::clone() because it is not needed anymore
Modified: code/branches/presentation2012merge/src/libraries/core/Super.h
===================================================================
--- code/branches/presentation2012merge/src/libraries/core/Super.h 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/libraries/core/Super.h 2012-07-21 13:51:06 UTC (rev 9320)
@@ -279,9 +279,6 @@
#define SUPER_changedUsed(classname, functionname, ...) \
SUPER_NOARGS(classname, functionname)
- #define SUPER_clone(classname, functionname, ...) \
- SUPER_ARGS(classname, functionname, __VA_ARGS__)
-
#define SUPER_changedCarrier(classname, functionname, ...) \
SUPER_NOARGS(classname, functionname)
@@ -565,15 +562,11 @@
()
SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
- SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(11, clone, true, OrxonoxClass*& item)
- (item)
- SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
-
- SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(12, changedCarrier, false)
+ SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(11, changedCarrier, false)
()
SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
- SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(13, changedPickedUp, false)
+ SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(12, changedPickedUp, false)
()
SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
@@ -631,7 +624,6 @@
SUPER_INTRUSIVE_DECLARATION(changedName);
SUPER_INTRUSIVE_DECLARATION(changedGametype);
SUPER_INTRUSIVE_DECLARATION(changedUsed);
- SUPER_INTRUSIVE_DECLARATION(clone);
SUPER_INTRUSIVE_DECLARATION(changedCarrier);
SUPER_INTRUSIVE_DECLARATION(changedPickedUp);
// (3/3) --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <--
Modified: code/branches/presentation2012merge/src/modules/pickup/Pickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/Pickup.cc 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/Pickup.cc 2012-07-21 13:51:06 UTC (rev 9320)
@@ -180,25 +180,6 @@
/**
@brief
- Creates a duplicate of the OrxonoxClass.
- @param item
- A reference to the pointer of the item that we're duplicating.
- */
- void Pickup::clone(OrxonoxClass*& item)
- {
- if(item == NULL)
- item = new Pickup(this);
-
- SUPER(Pickup, clone, item);
-
- Pickup* pickup = orxonox_cast<Pickup*>(item);
- pickup->setRepresentationName(this->getRepresentationName());
- pickup->setActivationType(this->getActivationType());
- pickup->setDurationType(this->getDurationType());
- }
-
- /**
- @brief
Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
@return
Returns true if a spawner was created, false if not.
Modified: code/branches/presentation2012merge/src/modules/pickup/Pickup.h
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/Pickup.h 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/Pickup.h 2012-07-21 13:51:06 UTC (rev 9320)
@@ -149,7 +149,6 @@
{ return this->getDurationType() == pickupDurationType::continuous; }
virtual void changedPickedUp(void); //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
- virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the OrxonoxClass.
protected:
virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
Modified: code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc 2012-07-21 13:51:06 UTC (rev 9320)
@@ -199,31 +199,6 @@
/**
@brief
- Creates a duplicate of the input Pickupable.
- This method needs to be implemented by any Class inheriting from Pickupable.
- @param item
- A reference to a pointer to the OrxonoxClass that is to be duplicated.
- */
- void PickupCollection::clone(OrxonoxClass*& item)
- {
- if(item == NULL)
- item = new PickupCollection(this);
-
- SUPER(PickupCollection, clone, item);
-
- PickupCollection* pickup = orxonox_cast<PickupCollection*>(item);
- pickup->setRepresentationName(this->getRepresentationName());
- // Clone all Pickupables this PickupCollection consist of.
- for(std::list<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
- {
- Pickupable* newPickup = (*it)->clone();
- CollectiblePickup* collectible = static_cast<CollectiblePickup*>(newPickup);
- pickup->addPickupable(collectible);
- }
- }
-
- /**
- @brief
Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
@param carrier
A pointer to the PickupCarrier we want to know of, whether it is a target of this PickupCollection.
Modified: code/branches/presentation2012merge/src/modules/pickup/PickupCollection.h
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/PickupCollection.h 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/PickupCollection.h 2012-07-21 13:51:06 UTC (rev 9320)
@@ -78,8 +78,6 @@
virtual void changedCarrier(void); //!< Is called when the pickup has changed its PickupCarrier.
virtual void changedPickedUp(void); //!< Is called when the pickup has transited from picked up to dropped or the other way around.
- virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input pickup.
-
virtual bool isTarget(const PickupCarrier* carrier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
inline void setRepresentationName(const std::string& name)
Modified: code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc 2012-07-21 13:51:06 UTC (rev 9320)
@@ -168,24 +168,6 @@
/**
@brief
- Creates a duplicate of the input OrxonoxClass.
- @param item
- A pointer to the Orxonox class.
- */
- void DamageBoostPickup::clone(OrxonoxClass*& item)
- {
- if(item == NULL)
- item = new DamageBoostPickup(this);
-
- SUPER(DamageBoostPickup, clone, item);
-
- DamageBoostPickup* pickup = orxonox_cast<DamageBoostPickup*>(item);
- pickup->setDuration(this->getDuration());
- pickup->setDamageMultiplier(this->getDamageMultiplier());
- }
-
- /**
- @brief
Sets the duration for which the DamageBoostPickup stays active.
@param duration
The duration in seconds.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h 2012-07-21 13:51:06 UTC (rev 9320)
@@ -54,7 +54,6 @@
virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a DamageBoostPickup object through XML.
virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
- virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
/**
@brief Get the time the DamagePickup lasts.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc 2012-07-21 13:51:06 UTC (rev 9320)
@@ -169,21 +169,4 @@
return pawn;
}
-
- /**
- @brief
- Creates a duplicate of the input OrxonoxClass.
- @param item
- A pointer to the Orxonox class.
- */
- void DronePickup::clone(OrxonoxClass*& item)
- {
- if(item == NULL)
- item = new DronePickup(this);
-
- SUPER(DronePickup, clone, item);
-
- DronePickup* pickup = orxonox_cast<DronePickup*>(item);
- pickup->setDroneTemplate(this->getDroneTemplate());
- }
}
Modified: code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.h
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.h 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.h 2012-07-21 13:51:06 UTC (rev 9320)
@@ -69,7 +69,6 @@
virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a DronePickup object through XML.
virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
- virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
const std::string& getDroneTemplate() const; //!< Get the name of the droneTemplate.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc 2012-07-21 13:51:06 UTC (rev 9320)
@@ -247,25 +247,6 @@
/**
@brief
- Creates a duplicate of the input OrxonoxClass.
- @param item
- A pointer to the Orxonox class.
- */
- void HealthPickup::clone(OrxonoxClass*& item)
- {
- if(item == NULL)
- item = new HealthPickup(this);
-
- SUPER(HealthPickup, clone, item);
-
- HealthPickup* pickup = orxonox_cast<HealthPickup*>(item);
- pickup->setHealth(this->getHealth());
- pickup->setHealthRate(this->getHealthRate());
- pickup->setHealthType(this->getHealthType());
- }
-
- /**
- @brief
Get the health type of this pickup.
@return
Returns the health type as a string.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.h
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.h 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.h 2012-07-21 13:51:06 UTC (rev 9320)
@@ -96,7 +96,6 @@
virtual void tick(float dt); //!< Is called every tick.
virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
- virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
/**
@brief Get the health that is transferred to the Pawn upon usage of this pickup.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc 2012-07-21 13:51:06 UTC (rev 9320)
@@ -131,23 +131,6 @@
/**
@brief
- Creates a duplicate of the input OrxonoxClass.
- @param item
- A pointer to the Orxonox class.
- */
- void InvisiblePickup::clone(OrxonoxClass*& item)
- {
- if(item == NULL)
- item = new InvisiblePickup(this);
-
- SUPER(InvisiblePickup, clone, item);
-
- InvisiblePickup* pickup = orxonox_cast<InvisiblePickup*>(item);
- pickup->setDuration(this->getDuration());
- }
-
- /**
- @brief
Sets the invisibility.
@param invisibility
The invisibility.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.h
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.h 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.h 2012-07-21 13:51:06 UTC (rev 9320)
@@ -74,7 +74,6 @@
virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a HealthPickup object through XML.
virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
- virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
/**
@brief Checks whether the Pawn is invisible.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc 2012-07-21 13:51:06 UTC (rev 9320)
@@ -146,23 +146,6 @@
/**
@brief
- Creates a duplicate of the input OrxonoxClass.
- @param item
- A pointer to the Orxonox class.
- */
- void MetaPickup::clone(OrxonoxClass*& item)
- {
- if(item == NULL)
- item = new MetaPickup(this);
-
- SUPER(MetaPickup, clone, item);
-
- MetaPickup* pickup = orxonox_cast<MetaPickup*>(item);
- pickup->setMetaType(this->getMetaType());
- }
-
- /**
- @brief
Get the meta type of this MetaPickup.
@return
Returns a string with the meta type of the MetaPickup.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.h
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.h 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.h 2012-07-21 13:51:06 UTC (rev 9320)
@@ -94,7 +94,6 @@
virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a MetaPickup object through XML.
virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
- virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
/**
@brief Returns the meta type of the MetaPickup.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc 2012-07-21 13:51:06 UTC (rev 9320)
@@ -158,25 +158,6 @@
/**
@brief
- Creates a duplicate of the input OrxonoxClass.
- @param item
- A pointer to the Orxonox class.
- */
- void ShieldPickup::clone(OrxonoxClass*& item)
- {
- if(item == NULL)
- item = new ShieldPickup(this);
-
- SUPER(ShieldPickup, clone, item);
-
- ShieldPickup* pickup = orxonox_cast<ShieldPickup*>(item);
- pickup->setDuration(this->getDuration());
- pickup->setShieldAbsorption(this->getShieldAbsorption());
- pickup->setShieldHealth(this->getShieldHealth());
- }
-
- /**
- @brief
Sets the duration.
@param duration
The duration in seconds.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.h
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.h 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.h 2012-07-21 13:51:06 UTC (rev 9320)
@@ -81,7 +81,6 @@
virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a HealthPickup object through XML.
virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
- virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
/**
@brief Get the duration, the time the shield is actvie at the most.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc 2012-07-21 13:51:06 UTC (rev 9320)
@@ -293,22 +293,4 @@
return pawn;
}
-
- /**
- @brief
- Creates a duplicate of the input OrxonoxClass.
- @param item
- A pointer to the Orxonox class.
- */
- void ShrinkPickup::clone(OrxonoxClass*& item)
- {
- if(item == NULL)
- item = new ShrinkPickup(this);
-
- SUPER(ShrinkPickup, clone, item);
- ShrinkPickup* pickup = orxonox_cast<ShrinkPickup*>(item);
- pickup->setShrinkFactor(this->getShrinkFactor());
- pickup->setDuration(this->getDuration());
- pickup->setShrinkDuration(this->getShrinkDuration());
- }
}
Modified: code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.h
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.h 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.h 2012-07-21 13:51:06 UTC (rev 9320)
@@ -79,7 +79,6 @@
virtual void changedUsed(void); // Is called when the pickup has transited from used to unused or the other way around.
virtual void changedPickedUp(void);
- virtual void clone(OrxonoxClass*& item); // Creates a duplicate of the input OrxonoxClass.
/**
@brief Get the shrinking factor.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc 2012-07-21 13:51:06 UTC (rev 9320)
@@ -159,25 +159,6 @@
/**
@brief
- Creates a duplicate of the input OrxonoxClass.
- @param item
- A pointer to the Orxonox class.
- */
- void SpeedPickup::clone(OrxonoxClass*& item)
- {
- if(item == NULL)
- item = new SpeedPickup(this);
-
- SUPER(SpeedPickup, clone, item);
-
- SpeedPickup* pickup = orxonox_cast<SpeedPickup*>(item);
- pickup->setDuration(this->getDuration());
- pickup->setSpeedAdd(this->getSpeedAdd());
- pickup->setSpeedMultiply(this->getSpeedMultiply());
- }
-
- /**
- @brief
Sets the duration for which the SpeedPickup stays active.
@param duration
The duration in seconds.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h 2012-07-21 13:51:06 UTC (rev 9320)
@@ -80,7 +80,6 @@
virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a HealthPickup object through XML.
virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
- virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
/**
@brief Get the duration, the time the SpeedPickup is active.
Modified: code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc
===================================================================
--- code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc 2012-07-21 13:51:06 UTC (rev 9320)
@@ -321,23 +321,6 @@
/**
@brief
- Creates a duplicate of the Pickupable.
- @return
- Returns the clone of this pickup as a pointer to a Pickupable.
- */
- Pickupable* Pickupable::clone(void)
- {
- OrxonoxClass* item = NULL;
- this->clone(item);
-
- Pickupable* pickup = orxonox_cast<Pickupable*>(item);
-
- orxout(verbose, context::pickups) << "Pickupable (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << endl;
- return pickup;
- }
-
- /**
- @brief
Method to transcribe a Pickupable as a Rewardable to the player.
@param player
A pointer to the PlayerInfo, do whatever you want with it.
Modified: code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.h
===================================================================
--- code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.h 2012-07-21 13:34:45 UTC (rev 9319)
+++ code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.h 2012-07-21 13:51:06 UTC (rev 9320)
@@ -136,14 +136,6 @@
bool addTarget(PickupCarrier* target); //!< Add a PickupCarrier as target of this Pickupable.
bool addTarget(Identifier* identifier); //!< Add a class, representetd by the input Identifier, as target of this Pickupable.
- Pickupable* clone(void); //!< Creates a duplicate of the Pickupable.
- /**
- @brief Creates a duplicate of the input OrxonoxClass.
- This method needs to be implemented by any Class inheriting from Pickupable.
- @param item A reference to a pointer to the OrxonoxClass that is to be duplicated.
- */
- virtual void clone(OrxonoxClass*& item) {}
-
bool setUsed(bool used); //!< Sets the Pickupable to used or unused, depending on the input.
bool setPickedUp(bool pickedUp); //!< Helper method to set the Pickupable to either picked up or not picked up.
bool setCarrier(PickupCarrier* carrier, bool tell = true); //!< Sets the carrier of the Pickupable.
@@ -195,9 +187,8 @@
//! SUPER functions.
SUPER_FUNCTION(10, Pickupable, changedUsed, false);
- SUPER_FUNCTION(12, Pickupable, changedCarrier, false);
- SUPER_FUNCTION(13, Pickupable, changedPickedUp, false);
- SUPER_FUNCTION(11, Pickupable, clone, false);
+ SUPER_FUNCTION(11, Pickupable, changedCarrier, false);
+ SUPER_FUNCTION(12, Pickupable, changedPickedUp, false);
}
#endif /* _Pickupable_H__ */
More information about the Orxonox-commit
mailing list