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:
@@ -10,11 +10,11 @@ EndermanRenderer::EndermanRenderer() : MobRenderer(new EndermanModel(), 0.5f)
|
||||
this->setArmor(model);
|
||||
}
|
||||
|
||||
void EndermanRenderer::render(shared_ptr<Entity> _mob, double x, double y, double z, float rot, float a)
|
||||
void EndermanRenderer::render(std::shared_ptr<Entity> _mob, double x, double y, double z, float rot, float a)
|
||||
{
|
||||
// 4J - original version used generics and thus had an input parameter of type Boat rather than shared_ptr<Entity> we have here -
|
||||
// 4J - original version used generics and thus had an input parameter of type Boat rather than std::shared_ptr<Entity> we have here -
|
||||
// do some casting around instead
|
||||
shared_ptr<EnderMan> mob = dynamic_pointer_cast<EnderMan>(_mob);
|
||||
std::shared_ptr<EnderMan> mob = dynamic_pointer_cast<EnderMan>(_mob);
|
||||
|
||||
model->carrying = mob->getCarryingTile() > 0;
|
||||
model->creepy = mob->isCreepy();
|
||||
@@ -29,11 +29,11 @@ void EndermanRenderer::render(shared_ptr<Entity> _mob, double x, double y, doubl
|
||||
MobRenderer::render(mob, x, y, z, rot, a);
|
||||
}
|
||||
|
||||
void EndermanRenderer::additionalRendering(shared_ptr<Mob> _mob, float a)
|
||||
void EndermanRenderer::additionalRendering(std::shared_ptr<Mob> _mob, float a)
|
||||
{
|
||||
// 4J - original version used generics and thus had an input parameter of type Boat rather than shared_ptr<Entity> we have here -
|
||||
// 4J - original version used generics and thus had an input parameter of type Boat rather than std::shared_ptr<Entity> we have here -
|
||||
// do some casting around instead
|
||||
shared_ptr<EnderMan> mob = dynamic_pointer_cast<EnderMan>(_mob);
|
||||
std::shared_ptr<EnderMan> mob = dynamic_pointer_cast<EnderMan>(_mob);
|
||||
|
||||
MobRenderer::additionalRendering(_mob, a);
|
||||
|
||||
@@ -68,11 +68,11 @@ void EndermanRenderer::additionalRendering(shared_ptr<Mob> _mob, float a)
|
||||
}
|
||||
}
|
||||
|
||||
int EndermanRenderer::prepareArmor(shared_ptr<Mob> _mob, int layer, float a)
|
||||
int EndermanRenderer::prepareArmor(std::shared_ptr<Mob> _mob, int layer, float a)
|
||||
{
|
||||
// 4J - original version used generics and thus had an input parameter of type Boat rather than shared_ptr<Entity> we have here -
|
||||
// 4J - original version used generics and thus had an input parameter of type Boat rather than std::shared_ptr<Entity> we have here -
|
||||
// do some casting around instead
|
||||
shared_ptr<EnderMan> mob = dynamic_pointer_cast<EnderMan>(_mob);
|
||||
std::shared_ptr<EnderMan> mob = dynamic_pointer_cast<EnderMan>(_mob);
|
||||
|
||||
if (layer != 0) return -1;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user