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:
@@ -8,7 +8,7 @@
|
||||
#include "Explosion.h"
|
||||
#include "SoundTypes.h"
|
||||
|
||||
Explosion::Explosion(Level *level, shared_ptr<Entity> source, double x, double y, double z, float r)
|
||||
Explosion::Explosion(Level *level, std::shared_ptr<Entity> source, double x, double y, double z, float r)
|
||||
{
|
||||
fire = false;
|
||||
random = new Random();
|
||||
@@ -97,14 +97,14 @@ void Explosion::explode()
|
||||
// Fix for 360 #123866 - [CRASH] TU13: Code: Compliance: Placing the TNT next to Ender Crystals will crash the title after a certain amount of time.
|
||||
// If we explode something next to an EnderCrystal then it creates a new explosion that overwrites the shared vector in the level
|
||||
// So copy it here instead of directly using the shared one
|
||||
vector<shared_ptr<Entity> > *levelEntities = level->getEntities(source, AABB::newTemp(x0, y0, z0, x1, y1, z1));
|
||||
vector<shared_ptr<Entity> > entities(levelEntities->begin(), levelEntities->end() );
|
||||
vector<std::shared_ptr<Entity> > *levelEntities = level->getEntities(source, AABB::newTemp(x0, y0, z0, x1, y1, z1));
|
||||
vector<std::shared_ptr<Entity> > entities(levelEntities->begin(), levelEntities->end() );
|
||||
Vec3 *center = Vec3::newTemp(x, y, z);
|
||||
|
||||
AUTO_VAR(itEnd, entities.end());
|
||||
for (AUTO_VAR(it, entities.begin()); it != itEnd; it++)
|
||||
{
|
||||
shared_ptr<Entity> e = *it; //entities->at(i);
|
||||
std::shared_ptr<Entity> e = *it; //entities->at(i);
|
||||
|
||||
// 4J Stu - If the entity is not in a block that would be blown up, then they should not be damaged
|
||||
// Fix for #46606 - TU5: Content: Gameplay: The player can be damaged and killed by explosions behind obsidian walls
|
||||
@@ -147,9 +147,9 @@ void Explosion::explode()
|
||||
double push = pow;
|
||||
e->xd += xa * push;
|
||||
e->yd += ya * push;
|
||||
e->zd += za * push;
|
||||
e->zd += za * push;
|
||||
|
||||
shared_ptr<Player> player = dynamic_pointer_cast<Player>(e);
|
||||
std::shared_ptr<Player> player = dynamic_pointer_cast<Player>(e);
|
||||
if (player != NULL)
|
||||
{
|
||||
//app.DebugPrintf("Adding player knockback (%f,%f,%f)\n", xa * pow, ya * pow, za * pow);
|
||||
@@ -255,7 +255,7 @@ Explosion::playerVec3Map *Explosion::getHitPlayers()
|
||||
return &hitPlayers;
|
||||
}
|
||||
|
||||
Vec3 *Explosion::getHitPlayerKnockback( shared_ptr<Player> player )
|
||||
Vec3 *Explosion::getHitPlayerKnockback( std::shared_ptr<Player> player )
|
||||
{
|
||||
AUTO_VAR(it, hitPlayers.find(player));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user