[Orxonox-commit 4608] r9279 - in code/branches/presentation2012merge/src: libraries/core modules/overlays/hud modules/pickup modules/pickup/items modules/weapons orxonox/controllers orxonox/gamestates orxonox/gametypes orxonox/interfaces orxonox/worldentities
landauf at orxonox.net
landauf at orxonox.net
Mon Jun 4 22:50:29 CEST 2012
Author: landauf
Date: 2012-06-04 22:50:28 +0200 (Mon, 04 Jun 2012)
New Revision: 9279
Modified:
code/branches/presentation2012merge/src/libraries/core/Super.h
code/branches/presentation2012merge/src/libraries/core/XMLPort.h
code/branches/presentation2012merge/src/modules/overlays/hud/HUDNavigation.cc
code/branches/presentation2012merge/src/modules/overlays/hud/HUDRadar.cc
code/branches/presentation2012merge/src/modules/pickup/Pickup.cc
code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc
code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc
code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc
code/branches/presentation2012merge/src/modules/weapons/RocketController.cc
code/branches/presentation2012merge/src/orxonox/controllers/NewHumanController.cc
code/branches/presentation2012merge/src/orxonox/gamestates/GSRoot.cc
code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc
code/branches/presentation2012merge/src/orxonox/gametypes/LastManStanding.cc
code/branches/presentation2012merge/src/orxonox/gametypes/LastTeamStanding.cc
code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc
code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.cc
Log:
use orxonox_cast instead of dynamic_cast wherever possible
Modified: code/branches/presentation2012merge/src/libraries/core/Super.h
===================================================================
--- code/branches/presentation2012merge/src/libraries/core/Super.h 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/libraries/core/Super.h 2012-06-04 20:50:28 UTC (rev 9279)
@@ -397,7 +397,7 @@
public: \
inline void operator()( SUPER_CALL_ARGUMENTS##hasarguments(__VA_ARGS__) ) \
{ \
- (dynamic_cast<T*>(object))->T:: functionname
+ (orxonox_cast<T*>(object))->T:: functionname
/*
JUST ADD THE FUNCTION ARGUMENTS BETWEEN BOTH MACROS, ENCLOSED BY BRACKETS
@@ -507,7 +507,7 @@
// @param ... The arguments of the function
inline void operator()( SUPER_CALL_ARGUMENTS##hasarguments(__VA_ARGS__) )
{
- (dynamic_cast<T*>(object))->T:: functionname ( Call the function with it's arguments );
+ (orxonox_cast<T*>(object))->T:: functionname ( Call the function with it's arguments );
}
Identifier* getParentIdentifier() const
Modified: code/branches/presentation2012merge/src/libraries/core/XMLPort.h
===================================================================
--- code/branches/presentation2012merge/src/libraries/core/XMLPort.h 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/libraries/core/XMLPort.h 2012-06-04 20:50:28 UTC (rev 9279)
@@ -196,7 +196,7 @@
containername = new orxonox::XMLPortClassParamContainer<objectclass>(std::string(paramname), ClassIdentifier<classname>::getIdentifier(), loadexecutor, saveexecutor); \
ClassIdentifier<classname>::getIdentifier()->addXMLPortParamContainer(paramname, containername); \
} \
- containername->port(dynamic_cast<BaseObject*>(this), object, xmlelement, mode)
+ containername->port(orxonox_cast<BaseObject*>(this), object, xmlelement, mode)
// --------------------
// XMLPortObjectExtended
Modified: code/branches/presentation2012merge/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/overlays/hud/HUDNavigation.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/overlays/hud/HUDNavigation.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -426,7 +426,7 @@
bool HUDNavigation::showObject(RadarViewable* rv)
{
- if ( rv == dynamic_cast<RadarViewable*> ( this->getOwner() ) )
+ if ( rv == orxonox_cast<RadarViewable*> ( this->getOwner() ) )
return false;
assert( rv->getWorldEntity() );
if ( rv->getWorldEntity()->isVisible()==false || rv->getRadarVisibility()==false )
Modified: code/branches/presentation2012merge/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/overlays/hud/HUDRadar.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/overlays/hud/HUDRadar.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -91,7 +91,7 @@
void HUDRadar::addObject(RadarViewable* object)
{
- if (object == dynamic_cast<RadarViewable*>(this->owner_))
+ if (object == orxonox_cast<RadarViewable*>(this->owner_))
return;
if( showObject(object) == false ) //do not show objects that are "invisible" or "radar invisible"
return;
@@ -188,7 +188,7 @@
bool HUDRadar::showObject(RadarViewable* rv)
{
- if ( rv == dynamic_cast<RadarViewable*> ( this->getOwner() ) )
+ if ( rv == orxonox_cast<RadarViewable*> ( this->getOwner() ) )
return false;
assert( rv->getWorldEntity() );
if ( rv->getWorldEntity()->isVisible()==false || rv->getRadarVisibility()==false )
Modified: code/branches/presentation2012merge/src/modules/pickup/Pickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/Pickup.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/pickup/Pickup.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -209,7 +209,7 @@
SUPER(Pickup, clone, item);
- Pickup* pickup = dynamic_cast<Pickup*>(item);
+ Pickup* pickup = orxonox_cast<Pickup*>(item);
pickup->setActivationTypeDirect(this->getActivationTypeDirect());
pickup->setDurationTypeDirect(this->getDurationTypeDirect());
Modified: code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -78,7 +78,7 @@
(*it)->destroy();
}
this->pickups_.clear();
-
+
if(this->pickupCollectionIdentifier_ != NULL)
delete this->pickupCollectionIdentifier_;
}
@@ -194,7 +194,7 @@
if(this->processingPickedUp_)
return;
- // If at least all the enabled pickups of this PickupCollection are no longer picked up.
+ // If at least all the enabled pickups of this PickupCollection are no longer picked up.
if(this->pickedUpCounter_ <= this->disabledCounter_ && this->isPickedUp())
this->Pickupable::destroy();
@@ -217,7 +217,7 @@
SUPER(PickupCollection, clone, item);
- PickupCollection* pickup = dynamic_cast<PickupCollection*>(item);
+ PickupCollection* pickup = orxonox_cast<PickupCollection*>(item);
// Clone all Pickupables this PickupCollection consist of.
for(std::vector<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
{
@@ -296,7 +296,7 @@
Informs the PickupCollection, that one of its pickups has changed its used status to the input value.
This is used internally by the CollectiblePickup class.
@param changed
- The value the used status has changed to.
+ The value the used status has changed to.
*/
void PickupCollection::pickupChangedUsed(bool changed)
{
Modified: code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -198,7 +198,7 @@
break;
Vector3 distance = it->getWorldPosition() - this->getWorldPosition();
- PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(*it);
+ PickupCarrier* carrier = orxonox_cast<PickupCarrier*>(*it);
// If a PickupCarrier, that fits the target-range of the Pickupable spawned by this PickupSpawner, is in trigger-distance and the carrier is not blocked.
if(distance.length() < this->triggerDistance_ && carrier != NULL && this->blocked_.find(carrier) == this->blocked_.end())
{
@@ -302,7 +302,7 @@
{
orxout(verbose, context::pickups) << "PickupSpawner (&" << this << ") triggered and active." << endl;
- PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(pawn);
+ PickupCarrier* carrier = orxonox_cast<PickupCarrier*>(pawn);
assert(carrier);
// If the Pawn isn't a target of the Pickupable.
Modified: code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -179,7 +179,7 @@
SpaceShip* DamageBoostPickup::carrierToSpaceShipHelper(void)
{
PickupCarrier* carrier = this->getCarrier();
- SpaceShip* ship = dynamic_cast<SpaceShip*>(carrier);
+ SpaceShip* ship = orxonox_cast<SpaceShip*>(carrier);
if(ship == NULL)
{
@@ -202,7 +202,7 @@
SUPER(DamageBoostPickup, clone, item);
- DamageBoostPickup* pickup = dynamic_cast<DamageBoostPickup*>(item);
+ DamageBoostPickup* pickup = orxonox_cast<DamageBoostPickup*>(item);
pickup->setDuration(this->getDuration());
pickup->setDamageMultiplier(this->getDamageMultiplier());
pickup->initializeIdentifier();
Modified: code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -143,7 +143,7 @@
drone->addTemplate(this->getDroneTemplate());
Controller* controller = drone->getController();
- DroneController* droneController = dynamic_cast<DroneController*>(controller);
+ DroneController* droneController = orxonox_cast<DroneController*>(controller);
if(droneController != NULL)
{
droneController->setOwner(pawn);
@@ -174,7 +174,7 @@
Pawn* DronePickup::carrierToPawnHelper(void)
{
PickupCarrier* carrier = this->getCarrier();
- Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+ Pawn* pawn = orxonox_cast<Pawn*>(carrier);
if(pawn == NULL)
{
@@ -197,7 +197,7 @@
SUPER(DronePickup, clone, item);
- DronePickup* pickup = dynamic_cast<DronePickup*>(item);
+ DronePickup* pickup = orxonox_cast<DronePickup*>(item);
pickup->setDroneTemplate(this->getDroneTemplate());
pickup->initializeIdentifier();
Modified: code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -229,7 +229,7 @@
if(this->getHealthTypeDirect() == pickupHealthType::temporary)
{
PickupCarrier* carrier = this->getCarrier();
- Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+ Pawn* pawn = orxonox_cast<Pawn*>(carrier);
if(pawn == NULL)
{
@@ -263,7 +263,7 @@
Pawn* HealthPickup::carrierToPawnHelper(void)
{
PickupCarrier* carrier = this->getCarrier();
- Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+ Pawn* pawn = orxonox_cast<Pawn*>(carrier);
if(pawn == NULL)
orxout(internal_error, context::pickups) << "Invalid PickupCarrier in HealthPickup." << endl;
@@ -284,7 +284,7 @@
SUPER(HealthPickup, clone, item);
- HealthPickup* pickup = dynamic_cast<HealthPickup*>(item);
+ HealthPickup* pickup = orxonox_cast<HealthPickup*>(item);
pickup->setHealth(this->getHealth());
pickup->setHealthRate(this->getHealthRate());
pickup->setHealthTypeDirect(this->getHealthTypeDirect());
Modified: code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -158,7 +158,7 @@
SUPER(InvisiblePickup, clone, item);
- InvisiblePickup* pickup = dynamic_cast<InvisiblePickup*>(item);
+ InvisiblePickup* pickup = orxonox_cast<InvisiblePickup*>(item);
pickup->setDuration(this->getDuration());
pickup->initializeIdentifier();
}
@@ -201,7 +201,7 @@
Pawn* InvisiblePickup::carrierToPawnHelper(void)
{
PickupCarrier* carrier = this->getCarrier();
- Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+ Pawn* pawn = orxonox_cast<Pawn*>(carrier);
if(pawn == NULL)
{
Modified: code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -171,7 +171,7 @@
SUPER(MetaPickup, clone, item);
- MetaPickup* pickup = dynamic_cast<MetaPickup*>(item);
+ MetaPickup* pickup = orxonox_cast<MetaPickup*>(item);
pickup->setMetaTypeDirect(this->getMetaTypeDirect());
pickup->initializeIdentifier();
Modified: code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -176,7 +176,7 @@
Pawn* ShieldPickup::carrierToPawnHelper(void)
{
PickupCarrier* carrier = this->getCarrier();
- Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+ Pawn* pawn = orxonox_cast<Pawn*>(carrier);
if(pawn == NULL)
{
@@ -198,7 +198,7 @@
SUPER(ShieldPickup, clone, item);
- ShieldPickup* pickup = dynamic_cast<ShieldPickup*>(item);
+ ShieldPickup* pickup = orxonox_cast<ShieldPickup*>(item);
pickup->setDuration(this->getDuration());
pickup->setShieldAbsorption(this->getShieldAbsorption());
pickup->setShieldHealth(this->getShieldHealth());
Modified: code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -147,7 +147,7 @@
void ShrinkPickup::changedPickedUp(void)
{
SUPER(ShrinkPickup, changedPickedUp);
-
+
if(!this->isPickedUp() && this->isActive_)
{
if(this->isShrinking_ || this->isTerminating_)
@@ -270,7 +270,7 @@
this->currentFactor_ = currentFactor;
bool destroy = false;
-
+
// Stop shrinking if the desired size is reached.
if(this->timeRemainig_ <= 0.0f)
{
@@ -313,7 +313,7 @@
Pawn* ShrinkPickup::carrierToPawnHelper(void)
{
PickupCarrier* carrier = this->getCarrier();
- Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+ Pawn* pawn = orxonox_cast<Pawn*>(carrier);
return pawn;
}
@@ -330,7 +330,7 @@
item = new ShrinkPickup(this);
SUPER(ShrinkPickup, clone, item);
- ShrinkPickup* pickup = dynamic_cast<ShrinkPickup*>(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/SpeedPickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -175,7 +175,7 @@
SpaceShip* SpeedPickup::carrierToSpaceShipHelper(void)
{
PickupCarrier* carrier = this->getCarrier();
- SpaceShip* ship = dynamic_cast<SpaceShip*>(carrier);
+ SpaceShip* ship = orxonox_cast<SpaceShip*>(carrier);
if(ship == NULL)
{
@@ -198,7 +198,7 @@
SUPER(SpeedPickup, clone, item);
- SpeedPickup* pickup = dynamic_cast<SpeedPickup*>(item);
+ SpeedPickup* pickup = orxonox_cast<SpeedPickup*>(item);
pickup->setDuration(this->getDuration());
pickup->setSpeedAdd(this->getSpeedAdd());
pickup->setSpeedMultiply(this->getSpeedMultiply());
Modified: code/branches/presentation2012merge/src/modules/weapons/RocketController.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/weapons/RocketController.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/modules/weapons/RocketController.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -52,7 +52,7 @@
// Create a rocket for the controller.
this->rocket_ = new SimpleRocket(this);
this->rocket_->setController(this);
- this->setControllableEntity(dynamic_cast<ControllableEntity*> (this->rocket_));
+ this->setControllableEntity(orxonox_cast<ControllableEntity*>(this->rocket_));
}
Modified: code/branches/presentation2012merge/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/presentation2012merge/src/orxonox/controllers/NewHumanController.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/orxonox/controllers/NewHumanController.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -297,7 +297,7 @@
{
//Used in HumanController for formationFlight
HumanController::hit(originator,contactpoint,damage);
-
+
if (this->showDamageOverlay_ && !this->controlPaused_ && this->controllableEntity_ && !this->controllableEntity_->isInMouseLook())
{
Vector3 posA;
@@ -396,7 +396,7 @@
WorldEntity* wePtr;
try
{
- wePtr = dynamic_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(itr->movable->getUserAny()));
+ wePtr = orxonox_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(itr->movable->getUserAny()));
}
catch (...)
{
Modified: code/branches/presentation2012merge/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- code/branches/presentation2012merge/src/orxonox/gamestates/GSRoot.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/orxonox/gamestates/GSRoot.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -75,8 +75,9 @@
unsigned int nr=0;
for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it; ++it)
{
- if (dynamic_cast<Synchronisable*>(*it))
- orxout(debug_output) << "object: " << it->getIdentifier()->getName() << " id: " << dynamic_cast<Synchronisable*>(*it)->getObjectID() << endl;
+ Synchronisable* synchronisable = orxonox_cast<Synchronisable*>(*it);
+ if (synchronisable)
+ orxout(debug_output) << "object: " << it->getIdentifier()->getName() << " id: " << synchronisable->getObjectID() << endl;
else
orxout(debug_output) << "object: " << it->getIdentifier()->getName() << endl;
nr++;
Modified: code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc
===================================================================
--- code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -150,7 +150,7 @@
evaluatePlayerParties(); //check if the party change has to trigger futher party changes
//Give new pig boost
- SpaceShip* spaceship = dynamic_cast<SpaceShip*>(victim);
+ SpaceShip* spaceship = orxonox_cast<SpaceShip*>(victim);
this->grantPigBoost(spaceship);
}
@@ -244,7 +244,7 @@
}
}
//Give new pig boost
- SpaceShip* spaceship = dynamic_cast<SpaceShip*>(victim);
+ SpaceShip* spaceship = orxonox_cast<SpaceShip*>(victim);
this->grantPigBoost(spaceship);
}
// killer vs piggy
@@ -425,7 +425,7 @@
void Dynamicmatch::setPlayerColour(PlayerInfo* player) // sets a player's colour
{
std::map<PlayerInfo*, int>::const_iterator it_player = this->playerParty_.find(player);
- Pawn* pawn = dynamic_cast<Pawn*>(player->getControllableEntity());
+ Pawn* pawn = orxonox_cast<Pawn*>(player->getControllableEntity());
if (pawn)
{
pawn->setRadarObjectColour(this->partyColours_[it_player->second]);
Modified: code/branches/presentation2012merge/src/orxonox/gametypes/LastManStanding.cc
===================================================================
--- code/branches/presentation2012merge/src/orxonox/gametypes/LastManStanding.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/orxonox/gametypes/LastManStanding.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -210,7 +210,7 @@
{
if(!player->getControllableEntity())
return;
- Pawn* pawn = dynamic_cast<Pawn*>(player->getControllableEntity());
+ Pawn* pawn = orxonox_cast<Pawn*>(player->getControllableEntity());
if(!pawn)
return;
if(bHardPunishment)
Modified: code/branches/presentation2012merge/src/orxonox/gametypes/LastTeamStanding.cc
===================================================================
--- code/branches/presentation2012merge/src/orxonox/gametypes/LastTeamStanding.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/orxonox/gametypes/LastTeamStanding.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -282,7 +282,7 @@
{
if(!player->getControllableEntity())
return;
- Pawn* pawn = dynamic_cast<Pawn*>(player->getControllableEntity());
+ Pawn* pawn = orxonox_cast<Pawn*>(player->getControllableEntity());
if(!pawn)
return;
if(bHardPunishment)
Modified: code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc
===================================================================
--- code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -337,7 +337,7 @@
OrxonoxClass* item = NULL;
this->clone(item);
- Pickupable* pickup = dynamic_cast<Pickupable*>(item);
+ Pickupable* pickup = orxonox_cast<Pickupable*>(item);
orxout(verbose, context::pickups) << "Pickupable (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << endl;
return pickup;
Modified: code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.cc
===================================================================
--- code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.cc 2012-06-04 20:14:08 UTC (rev 9278)
+++ code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.cc 2012-06-04 20:50:28 UTC (rev 9279)
@@ -265,7 +265,7 @@
this->cameraPositionRootNode_->setOrientation(Quaternion::IDENTITY);
this->cameraPositionRootNode_->_update(true, false); // update the camera node because otherwise the camera will drag back in position which looks strange
- NewHumanController* controller = dynamic_cast<NewHumanController*>(this->getController());
+ NewHumanController* controller = orxonox_cast<NewHumanController*>(this->getController());
if (controller)
controller->centerCursor();
}
More information about the Orxonox-commit
mailing list