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:
@@ -9,17 +9,17 @@ class Player;
|
||||
class IndirectEntityDamageSource : public EntityDamageSource
|
||||
{
|
||||
private:
|
||||
shared_ptr<Entity> owner;
|
||||
std::shared_ptr<Entity> owner;
|
||||
|
||||
public:
|
||||
//IndirectEntityDamageSource(const wstring &msgId, shared_ptr<Entity> entity, shared_ptr<Entity> owner);
|
||||
IndirectEntityDamageSource(ChatPacket::EChatPacketMessage msgId, shared_ptr<Entity> entity, shared_ptr<Entity> owner);
|
||||
//IndirectEntityDamageSource(const wstring &msgId, std::shared_ptr<Entity> entity, std::shared_ptr<Entity> owner);
|
||||
IndirectEntityDamageSource(ChatPacket::EChatPacketMessage msgId, std::shared_ptr<Entity> entity, std::shared_ptr<Entity> owner);
|
||||
virtual ~IndirectEntityDamageSource() { }
|
||||
|
||||
virtual shared_ptr<Entity> getDirectEntity(); // 4J Stu - Brought forward from 1.2.3 to fix #46422
|
||||
virtual shared_ptr<Entity> getEntity();
|
||||
virtual std::shared_ptr<Entity> getDirectEntity(); // 4J Stu - Brought forward from 1.2.3 to fix #46422
|
||||
virtual std::shared_ptr<Entity> getEntity();
|
||||
|
||||
// 4J Stu - Made return a packet
|
||||
//virtual wstring getLocalizedDeathMessage(shared_ptr<Player> player);
|
||||
virtual shared_ptr<ChatPacket> getDeathMessagePacket(shared_ptr<Player> player);
|
||||
//virtual wstring getLocalizedDeathMessage(std::shared_ptr<Player> player);
|
||||
virtual std::shared_ptr<ChatPacket> getDeathMessagePacket(std::shared_ptr<Player> player);
|
||||
};
|
||||
Reference in New Issue
Block a user