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:
@@ -4,32 +4,32 @@
|
||||
#include "net.minecraft.world.damagesource.h"
|
||||
#include "net.minecraft.network.packet.h"
|
||||
|
||||
//EntityDamageSource::EntityDamageSource(const wstring &msgId, shared_ptr<Entity> entity) : DamageSource(msgId)
|
||||
EntityDamageSource::EntityDamageSource(ChatPacket::EChatPacketMessage msgId, shared_ptr<Entity> entity) : DamageSource(msgId)
|
||||
//EntityDamageSource::EntityDamageSource(const wstring &msgId, std::shared_ptr<Entity> entity) : DamageSource(msgId)
|
||||
EntityDamageSource::EntityDamageSource(ChatPacket::EChatPacketMessage msgId, std::shared_ptr<Entity> entity) : DamageSource(msgId)
|
||||
{
|
||||
this->entity = entity;
|
||||
}
|
||||
|
||||
shared_ptr<Entity> EntityDamageSource::getEntity()
|
||||
std::shared_ptr<Entity> EntityDamageSource::getEntity()
|
||||
{
|
||||
return entity;
|
||||
}
|
||||
|
||||
//wstring EntityDamageSource::getLocalizedDeathMessage(shared_ptr<Player> player)
|
||||
//wstring EntityDamageSource::getLocalizedDeathMessage(std::shared_ptr<Player> player)
|
||||
//{
|
||||
// return L"death." + msgId + player->name + entity->getAName();
|
||||
// //return I18n.get("death." + msgId, player.name, entity.getAName());
|
||||
//}
|
||||
|
||||
shared_ptr<ChatPacket> EntityDamageSource::getDeathMessagePacket(shared_ptr<Player> player)
|
||||
std::shared_ptr<ChatPacket> EntityDamageSource::getDeathMessagePacket(std::shared_ptr<Player> player)
|
||||
{
|
||||
wstring additional = L"";
|
||||
if(entity->GetType() == eTYPE_SERVERPLAYER)
|
||||
{
|
||||
shared_ptr<Player> sourcePlayer = dynamic_pointer_cast<Player>(entity);
|
||||
std::shared_ptr<Player> sourcePlayer = dynamic_pointer_cast<Player>(entity);
|
||||
if(sourcePlayer != NULL) additional = sourcePlayer->name;
|
||||
}
|
||||
return shared_ptr<ChatPacket>( new ChatPacket(player->name, m_msgId, entity->GetType(), additional ) );
|
||||
return std::shared_ptr<ChatPacket>( new ChatPacket(player->name, m_msgId, entity->GetType(), additional ) );
|
||||
}
|
||||
|
||||
bool EntityDamageSource::scalesWithDifficulty()
|
||||
|
||||
Reference in New Issue
Block a user