diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-11-24 18:41:35 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-11-24 18:41:35 +0100 |
| commit | 82225a21e1b7f1671a42c1511032c59ecda0503f (patch) | |
| tree | bed0663df62a7210da6928c50a6ba99aed53cd1f /logic/BaseInstance.h | |
| parent | ca297fca79a7b1b96e41ba5abed4956af9383c16 (diff) | |
| parent | 75e7932607bdd84d2867765eb6f07dcec95ee193 (diff) | |
| download | MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar.gz MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar.lz MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar.xz MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.zip | |
Merge branch 'feature_yggdrasil' into develop
Conflicts:
gui/MainWindow.cpp
logic/OneSixInstance.h
Fix missing session id functionality for legacy and old onesix.
Diffstat (limited to 'logic/BaseInstance.h')
| -rw-r--r-- | logic/BaseInstance.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h index 6c9b16c7..cf86fda6 100644 --- a/logic/BaseInstance.h +++ b/logic/BaseInstance.h @@ -22,7 +22,7 @@ #include "inifile.h" #include "lists/BaseVersionList.h" -#include "net/LoginTask.h" +#include "logic/auth/MojangAccount.h" class QDialog; class Task; @@ -153,8 +153,8 @@ public: /// returns a valid update task if update is needed, NULL otherwise virtual Task *doUpdate() = 0; - /// returns a valid minecraft process, ready for launch - virtual MinecraftProcess *prepareForLaunch(LoginResponse response) = 0; + /// returns a valid minecraft process, ready for launch with the given account. + virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account) = 0; /// do any necessary cleanups after the instance finishes. also runs before /// 'prepareForLaunch' |