summaryrefslogtreecommitdiffstats
path: root/logic/BaseInstance.h
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-02-01 19:58:13 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-02-01 19:58:13 +0100
commit983a40698c47739fee3786cf54c917004523ea36 (patch)
tree4a0d73577afbf430934cd878ff23674aaa7aea74 /logic/BaseInstance.h
parent866d7029afa10293a57d71aecbe3629399c95d06 (diff)
parent1936bd181f57a554ce0dd757ffe9419100eb47f4 (diff)
downloadMultiMC-983a40698c47739fee3786cf54c917004523ea36.tar
MultiMC-983a40698c47739fee3786cf54c917004523ea36.tar.gz
MultiMC-983a40698c47739fee3786cf54c917004523ea36.tar.lz
MultiMC-983a40698c47739fee3786cf54c917004523ea36.tar.xz
MultiMC-983a40698c47739fee3786cf54c917004523ea36.zip
Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derpstances
Diffstat (limited to 'logic/BaseInstance.h')
-rw-r--r--logic/BaseInstance.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h
index a861e9b2..cd49f99b 100644
--- a/logic/BaseInstance.h
+++ b/logic/BaseInstance.h
@@ -155,10 +155,10 @@ public:
virtual SettingsObject &settings() const;
/// returns a valid update task
- virtual std::shared_ptr<Task> doUpdate(bool only_prepare) = 0;
+ virtual std::shared_ptr<Task> doUpdate() = 0;
/// returns a valid minecraft process, ready for launch with the given account.
- virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account) = 0;
+ virtual MinecraftProcess *prepareForLaunch(AuthSessionPtr account) = 0;
/// do any necessary cleanups after the instance finishes. also runs before
/// 'prepareForLaunch'