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:
@@ -25,7 +25,7 @@ Achievement::Achievement(int id, const wstring& name, int x, int y, Tile *icon,
|
||||
{
|
||||
}
|
||||
|
||||
Achievement::Achievement(int id, const wstring& name, int x, int y, shared_ptr<ItemInstance> icon, Achievement *requires)
|
||||
Achievement::Achievement(int id, const wstring& name, int x, int y, std::shared_ptr<ItemInstance> icon, Achievement *requires)
|
||||
: Stat( Achievements::ACHIEVEMENT_OFFSET + id, I18n::get(wstring(L"achievement.").append(name)) ), desc( I18n::get(wstring(L"achievement.").append(name).append(L".desc"))), icon(icon), x(x), y(y), requires(requires)
|
||||
{
|
||||
}
|
||||
@@ -36,7 +36,7 @@ Achievement *Achievement::setAwardLocallyOnly()
|
||||
return this;
|
||||
}
|
||||
|
||||
Achievement *Achievement::setGolden()
|
||||
Achievement *Achievement::setGolden()
|
||||
{
|
||||
isGoldenVar = true;
|
||||
return this;
|
||||
@@ -51,14 +51,14 @@ Achievement *Achievement::postConstruct()
|
||||
return this;
|
||||
}
|
||||
|
||||
bool Achievement::isAchievement()
|
||||
bool Achievement::isAchievement()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
wstring Achievement::getDescription()
|
||||
wstring Achievement::getDescription()
|
||||
{
|
||||
if (descFormatter != NULL)
|
||||
if (descFormatter != NULL)
|
||||
{
|
||||
return descFormatter->format(desc);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user