[Orxonox-commit 2845] r7548 - in code/trunk/src/modules: pickup pickup/items questsystem
dafrick at orxonox.net
dafrick at orxonox.net
Sat Oct 16 13:22:15 CEST 2010
Author: dafrick
Date: 2010-10-16 13:22:15 +0200 (Sat, 16 Oct 2010)
New Revision: 7548
Modified:
code/trunk/src/modules/pickup/PickupManager.cc
code/trunk/src/modules/pickup/PickupRepresentation.cc
code/trunk/src/modules/pickup/PickupSpawner.cc
code/trunk/src/modules/pickup/items/DronePickup.cc
code/trunk/src/modules/pickup/items/HealthPickup.cc
code/trunk/src/modules/pickup/items/InvisiblePickup.cc
code/trunk/src/modules/pickup/items/MetaPickup.cc
code/trunk/src/modules/pickup/items/ShieldPickup.cc
code/trunk/src/modules/pickup/items/SpeedPickup.cc
code/trunk/src/modules/questsystem/QuestHint.cc
Log:
Resolving some TODO's.
Modified: code/trunk/src/modules/pickup/PickupManager.cc
===================================================================
--- code/trunk/src/modules/pickup/PickupManager.cc 2010-10-16 10:37:09 UTC (rev 7547)
+++ code/trunk/src/modules/pickup/PickupManager.cc 2010-10-16 11:22:15 UTC (rev 7548)
@@ -208,7 +208,6 @@
@return
Returns a pointer to the PickupRepresentation.
*/
- //TODO: Why not return a const?
PickupRepresentation* PickupManager::getRepresentation(const PickupIdentifier* identifier)
{
std::map<const PickupIdentifier*, PickupRepresentation*, PickupIdentifierCompare>::iterator it = this->representations_.find(identifier);
Modified: code/trunk/src/modules/pickup/PickupRepresentation.cc
===================================================================
--- code/trunk/src/modules/pickup/PickupRepresentation.cc 2010-10-16 10:37:09 UTC (rev 7547)
+++ code/trunk/src/modules/pickup/PickupRepresentation.cc 2010-10-16 11:22:15 UTC (rev 7548)
@@ -84,15 +84,11 @@
if(this->isInitialized())
{
- //TODO: Also (network) unregister for master.
if(GameMode::isMaster() && this->pickup_ != NULL)
{
PickupManager::getInstance().unregisterRepresentation(this->pickup_->getPickupIdentifier(), this);
}
- if(!GameMode::isMaster())
- {
- PickupManager::getInstance().unregisterRepresentation(this);
- }
+ PickupManager::getInstance().unregisterRepresentation(this);
}
}
Modified: code/trunk/src/modules/pickup/PickupSpawner.cc
===================================================================
--- code/trunk/src/modules/pickup/PickupSpawner.cc 2010-10-16 10:37:09 UTC (rev 7547)
+++ code/trunk/src/modules/pickup/PickupSpawner.cc 2010-10-16 11:22:15 UTC (rev 7548)
@@ -96,7 +96,7 @@
{
PickupRepresentation* representation = PickupManager::getInstance().getRepresentation(this->pickup_->getPickupIdentifier());
this->attach(representation->getSpawnerRepresentation(this));
- this->setActive(true); //TODO: Needed?
+ this->setActive(true);
}
}
Modified: code/trunk/src/modules/pickup/items/DronePickup.cc
===================================================================
--- code/trunk/src/modules/pickup/items/DronePickup.cc 2010-10-16 10:37:09 UTC (rev 7547)
+++ code/trunk/src/modules/pickup/items/DronePickup.cc 2010-10-16 11:22:15 UTC (rev 7548)
@@ -130,10 +130,6 @@
{
SUPER(DronePickup, changedUsed);
- // If the pickup is not picked up nothing must be done.
- if(!this->isPickedUp())
- return;
-
// If the pickup has transited to used.
if(this->isUsed())
{
Modified: code/trunk/src/modules/pickup/items/HealthPickup.cc
===================================================================
--- code/trunk/src/modules/pickup/items/HealthPickup.cc 2010-10-16 10:37:09 UTC (rev 7547)
+++ code/trunk/src/modules/pickup/items/HealthPickup.cc 2010-10-16 11:22:15 UTC (rev 7548)
@@ -187,10 +187,6 @@
{
SUPER(HealthPickup, changedUsed);
- // If the pickup is not picked up nothing must be done.
- if(!this->isPickedUp()) //TODO: Needed?
- return;
-
// If the pickup has transited to used.
if(this->isUsed())
{
Modified: code/trunk/src/modules/pickup/items/InvisiblePickup.cc
===================================================================
--- code/trunk/src/modules/pickup/items/InvisiblePickup.cc 2010-10-16 10:37:09 UTC (rev 7547)
+++ code/trunk/src/modules/pickup/items/InvisiblePickup.cc 2010-10-16 11:22:15 UTC (rev 7548)
@@ -109,10 +109,6 @@
{
SUPER(InvisiblePickup, changedUsed);
- // If the pickup is not picked up nothing must be done.
- if(!this->isPickedUp())
- return;
-
// If the pickup has transited to used.
if (this->isUsed())
{
Modified: code/trunk/src/modules/pickup/items/MetaPickup.cc
===================================================================
--- code/trunk/src/modules/pickup/items/MetaPickup.cc 2010-10-16 10:37:09 UTC (rev 7547)
+++ code/trunk/src/modules/pickup/items/MetaPickup.cc 2010-10-16 11:22:15 UTC (rev 7548)
@@ -125,7 +125,6 @@
// If the metaType is destroyCarrier, then the PickupCarrier is destroyed.
if(this->getMetaTypeDirect() == pickupMetaType::destroyCarrier)
{
- this->Pickupable::destroy(); //TODO: Needed?
Pawn* pawn = orxonox_cast<Pawn*>(carrier);
pawn->kill();
return;
Modified: code/trunk/src/modules/pickup/items/ShieldPickup.cc
===================================================================
--- code/trunk/src/modules/pickup/items/ShieldPickup.cc 2010-10-16 10:37:09 UTC (rev 7547)
+++ code/trunk/src/modules/pickup/items/ShieldPickup.cc 2010-10-16 11:22:15 UTC (rev 7548)
@@ -126,10 +126,6 @@
{
SUPER(ShieldPickup, changedUsed);
- // If the pickup is not picked up nothing must be done.
- if(!this->isPickedUp())
- return;
-
Pawn* pawn = this->carrierToPawnHelper();
if(pawn == NULL)
this->Pickupable::destroy();
Modified: code/trunk/src/modules/pickup/items/SpeedPickup.cc
===================================================================
--- code/trunk/src/modules/pickup/items/SpeedPickup.cc 2010-10-16 10:37:09 UTC (rev 7547)
+++ code/trunk/src/modules/pickup/items/SpeedPickup.cc 2010-10-16 11:22:15 UTC (rev 7548)
@@ -126,10 +126,6 @@
{
SUPER(SpeedPickup, changedUsed);
- // If the pickup is not picked up nothing must be done.
- if(!this->isPickedUp())
- return;
-
Engine* engine = this->carrierToEngineHelper();
if(engine == NULL) // If the PickupCarrier is no Engine, then this pickup is useless and therefore is destroyed.
this->Pickupable::destroy();
Modified: code/trunk/src/modules/questsystem/QuestHint.cc
===================================================================
--- code/trunk/src/modules/questsystem/QuestHint.cc 2010-10-16 10:37:09 UTC (rev 7547)
+++ code/trunk/src/modules/questsystem/QuestHint.cc 2010-10-16 11:22:15 UTC (rev 7548)
@@ -89,7 +89,7 @@
*/
bool QuestHint::isActive(const PlayerInfo* player) const
{
- //TODO: Replace with asser.
+ //TODO: Replace with assert.
if(player == NULL) // NULL-Pointers are ugly!
{
ThrowException(Argument, "The input PlayerInfo* is NULL.");
More information about the Orxonox-commit
mailing list