shared_ptr -> std::shared_ptr
This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today.
This commit is contained in:
@@ -14,7 +14,7 @@ const double ThrownPotion::SPLASH_RANGE = 4.0;
|
||||
const double ThrownPotion::SPLASH_RANGE_SQ = ThrownPotion::SPLASH_RANGE * ThrownPotion::SPLASH_RANGE;
|
||||
|
||||
void ThrownPotion::_init()
|
||||
{
|
||||
{
|
||||
// 4J Stu - This function call had to be moved here from the Entity ctor to ensure that
|
||||
// the derived version of the function is called
|
||||
this->defineSynchedData();
|
||||
@@ -27,7 +27,7 @@ ThrownPotion::ThrownPotion(Level *level) : Throwable(level)
|
||||
_init();
|
||||
}
|
||||
|
||||
ThrownPotion::ThrownPotion(Level *level, shared_ptr<Mob> mob, int potionValue) : Throwable(level,mob)
|
||||
ThrownPotion::ThrownPotion(Level *level, std::shared_ptr<Mob> mob, int potionValue) : Throwable(level,mob)
|
||||
{
|
||||
_init();
|
||||
|
||||
@@ -74,15 +74,15 @@ void ThrownPotion::onHit(HitResult *res)
|
||||
if (mobEffects != NULL && !mobEffects->empty())
|
||||
{
|
||||
AABB *aoe = bb->grow(SPLASH_RANGE, SPLASH_RANGE / 2, SPLASH_RANGE);
|
||||
vector<shared_ptr<Entity> > *entitiesOfClass = level->getEntitiesOfClass(typeid(Mob), aoe);
|
||||
vector<std::shared_ptr<Entity> > *entitiesOfClass = level->getEntitiesOfClass(typeid(Mob), aoe);
|
||||
|
||||
if (entitiesOfClass != NULL && !entitiesOfClass->empty())
|
||||
{
|
||||
//for (Entity e : entitiesOfClass)
|
||||
for(AUTO_VAR(it, entitiesOfClass->begin()); it != entitiesOfClass->end(); ++it)
|
||||
{
|
||||
//shared_ptr<Entity> e = *it;
|
||||
shared_ptr<Mob> e = dynamic_pointer_cast<Mob>( *it );
|
||||
//std::shared_ptr<Entity> e = *it;
|
||||
std::shared_ptr<Mob> e = dynamic_pointer_cast<Mob>( *it );
|
||||
double dist = distanceToSqr(e);
|
||||
if (dist < SPLASH_RANGE_SQ)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user