diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:49:42 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-20 09:49:42 +1100 |
commit | aa987a217779e71f97ee4c9cce531aec1c861bf8 (patch) | |
tree | e51fcce110306d93bf93870f13a5ff7d6b575427 /source/frontend/StarQuestInterface.cpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/frontend/StarQuestInterface.cpp')
-rw-r--r-- | source/frontend/StarQuestInterface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/frontend/StarQuestInterface.cpp b/source/frontend/StarQuestInterface.cpp index d9f0b1b..b862b31 100644 --- a/source/frontend/StarQuestInterface.cpp +++ b/source/frontend/StarQuestInterface.cpp @@ -287,7 +287,7 @@ void QuestLogInterface::showQuests(List<QuestPtr> quests) { verticalLayout->update(0); } -QuestPane::QuestPane(QuestPtr const& quest, PlayerPtr player) : Pane(), m_quest(quest), m_player(move(player)) {} +QuestPane::QuestPane(QuestPtr const& quest, PlayerPtr player) : Pane(), m_quest(quest), m_player(std::move(player)) {} void QuestPane::commonSetup(Json config, String bodyText, String const& portraitName) { GuiReader reader; @@ -348,7 +348,7 @@ PanePtr QuestPane::createTooltip(Vec2I const& screenPosition) { } NewQuestInterface::NewQuestInterface(QuestManagerPtr const& manager, QuestPtr const& quest, PlayerPtr player) - : QuestPane(quest, move(player)), m_manager(manager), m_declined(false) { + : QuestPane(quest, std::move(player)), m_manager(manager), m_declined(false) { auto assets = Root::singleton().assets(); List<Drawable> objectivePortrait = m_quest->portrait("Objective").value({}); @@ -436,7 +436,7 @@ void QuestCompleteInterface::close() { dismiss(); } -QuestFailedInterface::QuestFailedInterface(QuestPtr const& quest, PlayerPtr player) : QuestPane(quest, move(player)) { +QuestFailedInterface::QuestFailedInterface(QuestPtr const& quest, PlayerPtr player) : QuestPane(quest, std::move(player)) { auto assets = Root::singleton().assets(); String configFile = m_quest->getTemplate()->questFailedGuiConfig.value(assets->json("/quests/quests.config:defaultGuiConfigs.questFailed").toString()); Json config = assets->json(configFile); |