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/OneSixInstance.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/OneSixInstance.h')
| -rw-r--r-- | logic/OneSixInstance.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/logic/OneSixInstance.h b/logic/OneSixInstance.h index 2d44ddba..e30ca7ca 100644 --- a/logic/OneSixInstance.h +++ b/logic/OneSixInstance.h @@ -40,7 +40,8 @@ public: virtual QString instanceConfigFolder() const; virtual Task *doUpdate(); - virtual MinecraftProcess *prepareForLaunch(LoginResponse response); + virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account); + virtual void cleanupAfterRun(); virtual QString intendedVersionId() const; @@ -72,5 +73,5 @@ public: virtual QString getStatusbarDescription(); private: - QStringList processMinecraftArgs(LoginResponse response); -};
\ No newline at end of file + QStringList processMinecraftArgs(MojangAccountPtr account); +}; |