Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared_ptr -> std::shared_ptr

Browse Source 
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:
void_17
2026-03-02 15:58:20 +07:00
parent d63f79325f
commit 7074f35e4b
1373 changed files with 12054 additions and 12054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Minecraft.World/Arrow.cpp
View File

@@ -52,7 +52,7 @@ Arrow::Arrow(Level *level) : Entity( level )
this->setSize(0.5f, 0.5f);
}
Arrow::Arrow(Level *level, shared_ptr<Mob> mob, shared_ptr<Mob> target, float power, float uncertainty) : Entity( level )
Arrow::Arrow(Level *level, std::shared_ptr<Mob> mob, std::shared_ptr<Mob> target, float power, float uncertainty) : Entity( level )
{
_init();
@@ -88,8 +88,8 @@ Arrow::Arrow(Level *level, double x, double y, double z) : Entity( level )
this->setPos(x, y, z);
this->heightOffset = 0;
}
Arrow::Arrow(Level *level, shared_ptr<Mob> mob, float power) : Entity( level )
Arrow::Arrow(Level *level, std::shared_ptr<Mob> mob, float power) : Entity( level )
{
_init();
@@ -171,12 +171,12 @@ void Arrow::lerpMotion(double xd, double yd, double zd)
}
}
void Arrow::tick()
void Arrow::tick()
{
Entity::tick();
if (xRotO == 0 && yRotO == 0)
if (xRotO == 0 && yRotO == 0)
{
double sd = sqrt(xd * xd + zd * zd);
yRotO = this->yRot = (float) (atan2(xd, zd) * 180 / PI);
@@ -214,17 +214,17 @@ void Arrow::tick()
life = 0;
flightTime = 0;
return;
}
}
else
else
{
life++;
if (life == 20 * 60) remove();
return;
}
}
else
}
else
{
flightTime++;
}
@@ -239,13 +239,13 @@ void Arrow::tick()
{
to = Vec3::newTemp(res->pos->x, res->pos->y, res->pos->z);
}
shared_ptr<Entity> hitEntity = nullptr;
vector<shared_ptr<Entity> > *objects = level->getEntities(shared_from_this(), this->bb->expand(xd, yd, zd)->grow(1, 1, 1));
std::shared_ptr<Entity> hitEntity = nullptr;
vector<std::shared_ptr<Entity> > *objects = level->getEntities(shared_from_this(), this->bb->expand(xd, yd, zd)->grow(1, 1, 1));
double nearest = 0;
AUTO_VAR(itEnd, objects->end());
for (AUTO_VAR(it, objects->begin()); it != itEnd; it++)
{
shared_ptr<Entity> e = *it; //objects->at(i);
std::shared_ptr<Entity> e = *it; //objects->at(i);
if (!e->isPickable() || (e == owner && flightTime < 5)) continue;
float rr = 0.3f;
@@ -299,7 +299,7 @@ void Arrow::tick()
res->entity->setOnFire(5);
}
shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>(res->entity);
std::shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>(res->entity);
if (mob != NULL)
{
mob->arrowCount++;
@@ -333,7 +333,7 @@ void Arrow::tick()
// 4J - sound change brought forward from 1.2.3
level->playSound(shared_from_this(), eSoundType_RANDOM_BOW_HIT, 1.0f, 1.2f / (random->nextFloat() * 0.2f + 0.9f));
remove();
}
}
else
{
xd *= -0.1f;
@@ -343,7 +343,7 @@ void Arrow::tick()
yRotO += 180;
flightTime = 0;
}
delete damageSource;
}
else
@@ -464,7 +464,7 @@ void Arrow::readAdditionalSaveData(CompoundTag *tag)
}
}
void Arrow::playerTouch(shared_ptr<Player> player)
void Arrow::playerTouch(std::shared_ptr<Player> player)
{
if (level->isClientSide || !inGround || shakeTime > 0) return;
@@ -472,7 +472,7 @@ void Arrow::playerTouch(shared_ptr<Player> player)
if (pickup == PICKUP_ALLOWED)
{
if (!player->inventory->add( shared_ptr<ItemInstance>( new ItemInstance(Item::arrow, 1) ) ))
if (!player->inventory->add( std::shared_ptr<ItemInstance>( new ItemInstance(Item::arrow, 1) ) ))
{
bRemove = false;
}